broker-service refactor