Improvements to the DataStreamer