More work on Core Data support.