Datamodel updated