Added CoreData support.
Merged in CoreData support.