Refactoring :
* Move indexation into event flow