Data model fixed