Improve speed indexation