Refactor room api according to the feed changes