added providers and multi-country support