Updated the messaging according to the wire protocol