Refactored Generators