Adding provider support