data model fixed