StreamManager refactoring