Moving to MOGenerator