Better service discovery.