Added support for OutputHandler