added Bazaar support