Support new table format