refactored generator commands