Total revamp of message structure