Changes to support non-multicast discovery