Change argument sequence to match get_tabular_data