Added data models for the switch to Core Data