Adding some data generation