Improve legacy table support.