Fix JSONKit warning & refactor Core Data stack