Update so that we can move to event based fetch.