Feed refactor