Core Data migration & refactoring, to be continued...