Made changes to demo data generator