Fixed missing CoreData imports