Improve indexation