Changed to use alpha-2 codes for countries as defined in ISO 3166-1