added GeneratedData and working on ManualData