Added Solr and updated for oracle