Add the product Type class and make Pair a simple data type