Didn't stream before. Streaming is added as part of this PR.