Added auto-indexing