Correctly define stream types