Added old HandShake as ListeningEndpoint