Changes to ActivityDiscovery