Refactoring Begin Seperating the Source from the Subscription
Seperation of Source and Subscriptions