Adding basic phone number support