Fixed handshake to allow actions to provide the HandShake as well