Added the message class