discovery: consolidate proxyDiscover and Discover interface