Adding some streams2 stuff.