Added support for streams