Improvements for the Stream module.