Refactor to account only for sub/unsub scenarios