Generators are now created correctly