Use new valve lookup protocol