updated to add solr support