Reworks how builder works for AddressPair. (experimental)
create options and update options for AddressPair (experimental).