Removed dependency on broker component