Revamp subscription logic