add Pair support