adjusted core data model