Move handshake to other protocol class