Add raw request, response, handshake to return value