New organization of the message object