New way to handle Streams

- Commit for SIPit