Working on new Generator module