Adding updated message structure