Move show_table upstream