Added support for phone number formatting