Updated data generator