changed core data model