Updated DataGenerator to generate in a single file