Added make_pair_table