Temporary commit of moving some functions from Helper to dedicated GeneratorEncoder