Fix the plumbing in accordance to broker