Updated handshake message primitive