Modified Data Generator for new DB