Improved data generation