Add support for stdout returns