Allow ISO 3166 alpha2 codes to be optionally used