Add stream handling