- Use a map structure instead of vector for Streams
 - Add security on stream indexing