Get rid from the DataGenerator singleton