Rearrange request/response to support new Connections.