Updating Datastream generator

Including a few more fields