update for stateful river/feeder model, plugs for ES 1.2