Working on Solr integration