Adding support for phone numbers