Add support for multiple contact types per person.