Added support for solr