Fix bugs : redesign indexation of the objects.