Improve data generation