Make solr definition optional