Adjustments to the wire protocol