Improve feeds generation