Improving Core Data support.