TASK: Refactor Rss