Integrating changes for wide-scale Core Data support.