Refactored streaming API interface