Added first changes to support updating recipients without recreating them.