Added CoreData and data model