Add support for streams2, streams1 should still work (i hope)