Added some TODOs to the feed-plugin