CON-2004 move helper methods to separate module