Added country code normalization