Changes for more providers