Updated with more recent Solr