Added the Message class