Made modifications to the broker module

Signed-off-by: Harish Patel <harish.patel@vitruviantech.com>