Adding handshake info