Add support for intermittent streams