adapt to the existing dest_address_id field