severe modifications to the indexing classes