MSE-8 Changes for message protocol