Changed CoreDataStack
Merge