Core data model fix