Updated core data model