Started refactoring Subscription