Solr related changes