eliminated RawCountry class, replaced with simple dict