Replace OuputFile addstream methods return types by OutputStream