Revert "Refactored streaming API interface"

This reverts commit 19e26e63f5ae482774e81718f64f3bf604d24240.
Refactored streaming API interface maintaining backward compatibility