updated DataGenerator and Copy Entity