Change to work with Solr