Add gestion of indexes and update data qualification