Improved autodiscover pattern