Add support for Streaming