Added in tokens for email address, phone and fax numbers.