Added support for streaming.