Trying to make service discovery and wire up simpler