Add support for multiple addresses for contacts.