adding AutoDiscover Support