[Index] Refacto code + enable shuffling