Begin changes for core data