Use new skip_index_update where needed