Updated to latest feed-api changes