Core Data and other changes