Main message structure change