CE-1019 Spread MainHelper methods to right helpers