Changed the message structure