Added CoreData support