Less noisy autodiscovery and trinary added