Update to changes in feed-base