Moved Data Generator to own file