Refactoring of Stream Manager : Subscribers & Streams