Refactored generators.