Switch to javatuples#Pair