Reworking the SolrHelper class