Use new table format