Updated datamodel