Updated DiscoveryRequest and ComponentType