Added streams support