Refactored generators