Changed the index to be the class retriever.