Improvements on the Streaming framework