Needed to add explicit requires because of the latest ServiceDiscovery changes