data model fixes