more changes in data model