Add full support for V3 handshake.