final updates to data model structure