Extract DataGenerator to a seperate file