Add new support for OutputMode, CAPTURED still to be implemented