Started implementing support for update modes (INSTANT or ON_DEMAND)