fix data model