Adding support for Streams 2.