refactored to move the client mapping to just the config loaded from the service model