Fix CoreData import
Fix CoreData import