More corrections on using/import table