Modified some modules to work with the new generator