more changes to data model