Added support for data generation