Added support for address
Added support for phoneNumber