HelperBroker refactor