Update to latest feed refactoring