Fix core data model