More integration with Core Data