Adding support for stdin / stdout