Core Data refactoring: