WIP - always return Stream rather than DecodedStream