Refactored list generators