Updated TableScan mapping.