Revising indexing implementation
Idea for multilevel indexing seems not to work since most of the first-level index is modified