Improve feed spec