[Connect/Streams] Refactoring the Stream class (WIP).