Refactored Solr Catalog Provider implementations to allow others to extend