Add support for multiple outputs