Added message-class