Generators restructured, working enums