Fix CoreData dependency