Revamped Pair class