Added a bunch of data related changes to dummy data generator