Added Core Data model, replaced TKPCategory