add CoreData support