Updated Solr class