Changes to make broker backward compactibile with current producer and consumer