Added new entities to data model
made core data entities non-plural