Add streaming support from #989