Bring tabulate into sync with the new formate