Added streams support + tests