Minor datamodel changes