more data model changes