Data Generator Refactored