If the problem is with Current in void-safe mode, then I don't think that it is polluting class IDENTIFIED to move them there. I think that these are general purpose routines (not specific to WEL) in void-safe mode. -- Eric Bezault