Added support for rawTapOutput in options