Add support for output types