Updates to datamodel