more broker config refactor