updated indexing architecture