Improved data generation.