PLAT-4706 - Use Pairs instead of Pair