Added class w/ optional OutputStream