implemented new indexing schema