Removed dependency on Pigeon & require sys.c-table-importer.mapping table now