More changes to support new protocol