Add support for streaming