Updated code for broker support

Updated code for broker support