Moved back to SynthData class. More cleanup