RSS refactoring