Updated core data entities