Add CountryType to CountryField conversion