Updated to latest feed-api, removal of event types