Changed handling for DiscoveryRouter