Add better logging for streams
Add better logging for streams