Update SendStatement conversion to allow choice