Adjustment due to changes in KeyValueStore