Update get/set contactMethodType to use full object
Update get/set IdType to use full object
Update get/set AddressType to use full object