Added support for streams.