[streaming] DataStream type refactor for easier future extensions