Changes to ActivityDiscovery
Changes to ActivityDiscovery