Changes due to StreamManager refactoring