Data Generator Changes