Streams support added.