Subscriber refactoring