Minor Updates
Updated to new Datamodel