[Bazaar] Add Bazaar support