Added Solr support