Separated the broker from publisher