Fixed handshake to always include instance number