Adding stream support