Modifications for message protocol