Updated Data Generator