Improved discovery protocols to support manual discovery addrs