Still refactoring generators - still WIP