Don't store Broker URLs in two variables

Simply embed the custom config type in the Client object.