Improvements in the Indexing procedure