Feature/efficient indexing