Adding subscription logic