Added a message class