[TASK] Performance improvement on indexing process