Changed the design of the message system