Fixed core data model inconsistency