Added StreamMap and AddStreams