Refactoring of feed subscription