Adding output stream provider; removing code util, simplifying