More efficient network discovery