Stream support (22/34)

Stream support