Updated with ECPhoneNumberFormatter