Continued work on the datamodel