Another round of development to index shell.