Updated sample data generator