Subscriber refactor