datamodel updates after review