Abdullah - CountryIndicators changes