Added stream support