Streaming

Streaming related updates