Feature/data generation