Added the Message and Pair Class