Added support for Core Data backed tables