updated datamodel