Transitioning persistence to Core Data