Added Message and SimpleMessage.