Adding multiple provider support.