diff --git a/Dockerfile b/Dockerfile
index cfbb76d..fb635b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM semtech/mu-jruby-template:3.1.0
+FROM semtech/mu-jruby-template
 
 LABEL maintainer="redpencil <info@redpencil.io>"
 # 200MB
diff --git a/Gemfile b/Gemfile
index 1350537..f041819 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source 'https://rubygems.org' do
-  gem 'listen', '~> 3.0'
   gem 'parallel', '~> 1.17.0'
   gem "concurrent-ruby", "~> 1.1"
+  # matching our current backend setup
+  gem "elasticsearch", "~> 7.17"
+  gem "faraday-typhoeus", "~> 1.1"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 1d868bd..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,38 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.3)
-    elasticsearch (6.8.1)
-      elasticsearch-api (= 6.8.1)
-      elasticsearch-transport (= 6.8.1)
-    elasticsearch-api (6.8.1)
-      multi_json
-    elasticsearch-transport (6.8.1)
-      faraday (>= 0.14, < 1)
-      multi_json
-    faraday (0.17.3)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.13.1-java)
-    listen (3.2.1)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    multi_json (1.14.1)
-    multipart-post (2.1.1)
-    parallel (1.17.0)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
-      ffi (~> 1.0)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  concurrent-ruby (~> 1.1)
-  connection_pool (~> 2.2)
-  elasticsearch (~> 6.1)
-  listen (~> 3.0)
-  parallel (~> 1.17.0)
-
-BUNDLED WITH
-   2.1.0
diff --git a/framework/elastic.rb b/framework/elastic.rb
deleted file mode 100644
index 2fe04e3..0000000
--- a/framework/elastic.rb
+++ /dev/null
@@ -1,372 +0,0 @@
-# A quick as-needed Elastic API, for use until
-# the conflict with Sinatra::Utils is resolved
-# * does not follow the standard API
-# * see: https://github.com/mu-semtech/mu-ruby-template/issues/16
-class Elastic
-  # Sets up the ElasticSearch instance
-  def initialize(host: "localhost", port: 9200, logger:)
-    @host = host
-    @port = port
-    @port_s = port.to_s
-    @logger = logger
-  end
-
-  # Checks whether or not ElasticSearch is up
-  #
-  # Executes a health check and accepts either "green" or "yellow".
-  def up?
-    uri = URI("http://#{@host}:#{@port_s}/_cluster/health")
-    req = Net::HTTP::Get.new(uri)
-    begin
-      resp = run(uri, req)
-      if resp.is_a? Net::HTTPSuccess
-        health = JSON.parse resp.body
-        health["status"] == "yellow" or health["status"] == "green"
-      else
-        false
-      end
-    rescue
-      false
-    end
-  end
-
-  # Checks whether or not the supplied index exists.
-  #   - index: string name of the index
-  #
-  # Executes a HEAD request. If that succeeds we can assume the index
-  # exists.
-  def index_exists?(index)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}")
-    req = Net::HTTP::Head.new(uri)
-
-    begin
-      resp = run(uri, req)
-      resp.is_a?(Net::HTTPSuccess) ? true : false
-    rescue StandardError => e
-      @logger.warn("ELASTICSEARCH") { "Failed to detect whether index #{index} exists. Assuming it doesn't." }
-      @logger.warn("ELASTICSEARCH") { e.full_message }
-      false
-    end
-  end
-
-  # Creates an index in Elasticsearch
-  #   - index: Index to be created
-  #   - mappings: Optional pre-defined document mappings for the index,
-  #     JSON object passed directly to Elasticsearch.
-  #   - settings: Optional JSON object passed directly to Elasticsearch
-  def create_index(index, mappings = nil, settings = nil)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}")
-    req = Net::HTTP::Put.new(uri)
-    req_body = {
-      mappings: mappings,
-      settings: settings
-    }.to_json
-    req.body = req_body
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPSuccess
-      @logger.debug("ELASTICSEARCH") { "Successfully created index #{index}" }
-      resp
-    else
-      @logger.error("ELASTICSEARCH") { "Failed to create index #{index}.\nPUT #{uri}\nRequest: #{req_body}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      if resp.is_a? Net::HTTPClientError # 4xx status code
-        raise ArgumentError, "Failed to create index #{index}: #{req_body}"
-      else
-        raise "Failed to create index #{index}"
-      end
-    end
-  end
-
-  # Deletes an index from ElasticSearch
-  #   - index: Name of the index to be removed
-  #
-  # Returns true when the index existed and is succesfully deleted.
-  # Otherwise false.
-  # Throws an error if the index exists but fails to be deleted.
-  def delete_index(index)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}")
-    req = Net::HTTP::Delete.new(uri)
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPNotFound
-      @logger.debug("ELASTICSEARCH") { "Index #{index} doesn't exist and cannot be deleted." }
-      false
-    elsif resp.is_a? Net::HTTPSuccess
-      @logger.debug("ELASTICSEARCH") { "Successfully deleted index #{index}" }
-      true
-    else
-      @logger.error("ELASTICSEARCH") { "Failed to delete index #{index}.\nDELETE #{uri}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      raise "Failed to delete index #{index}"
-    end
-  end
-
-  # Refreshes an ElasticSearch index, making documents available for
-  # search.
-  #   - index: Name of the index which will be refreshed.
-  #
-  # Returns whether the refresh succeeded
-  #
-  # When we store documents in ElasticSearch, they are not necessarily
-  # available immediately. It requires a refresh of the index. This
-  # operation happens once every second. When we build an index to
-  # query it immediately, we should ensure to refresh the index before
-  # querying.
-  def refresh_index(index)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}/_refresh")
-    req = Net::HTTP::Post.new(uri)
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPSuccess
-      @logger.debug("ELASTICSEARCH") { "Successfully refreshed index #{index}" }
-      true
-    else
-      @logger.warn("ELASTICSEARCH") { "Failed to refresh index #{index}.\nPOST #{uri}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      false
-    end
-  end
-
-  # Clear a given index by deleting all documents in the Elasticsearch index
-  #   - index: Index name to clear
-  # Note: this operation does not delete the index in Elasticsearch
-  def clear_index(index)
-    if index_exists? index
-      resp = delete_documents_by_query index, { query: { match_all: {} } }
-      if resp.is_a? Net::HTTPSuccess
-        @logger.debug("ELASTICSEARCH") { "Successfully cleared index #{index}" }
-        resp
-      else
-        @logger.error("ELASTICSEARCH") { "Failed to clear index #{index}.\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-        raise "Failed to clear index #{index}"
-      end
-    end
-  end
-
-  # Gets a single document from an index by its ElasticSearch id.
-  # Returns nil if the document cannot be found.
-  #   - index: Index to retrieve the document from
-  #   - id: ElasticSearch ID of the document
-  def get_document(index, id)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}/_doc/#{CGI::escape(id)}")
-    req = Net::HTTP::Get.new(uri)
-    resp = run(uri, req)
-    if resp.is_a? Net::HTTPNotFound
-      @logger.debug("ELASTICSEARCH") { "Document #{id} not found in index #{index}" }
-      nil
-    elsif resp.is_a? Net::HTTPSuccess
-      JSON.parse resp.body
-    else
-      @logger.error("ELASTICSEARCH") { "Failed to get document #{id} from index #{index}.\nGET #{uri}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      raise "Failed to get document #{id} from index #{index}"
-    end
-  end
-
-  # Inserts a new document in an Elasticsearch index
-  #   - index: Index to store the document in.
-  #   - id: Elasticsearch identifier to store the document under.
-  #   - document: document contents to index (as a ruby json object)
-  # Returns the inserted document
-  # Raises an error on failure.
-  def insert_document(index, id, document)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}/_doc/#{CGI::escape(id)}")
-    req = Net::HTTP::Put.new(uri)
-    req_body = document.to_json
-    req.body = req_body
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPSuccess
-      @logger.debug("ELASTICSEARCH") { "Inserted document #{id} in index #{index}" }
-      JSON.parse resp.body
-    else
-      @logger.error("ELASTICSEARCH") { "Failed to insert document #{id} in index #{index}.\nPUT #{uri}\nRequest: #{req_body}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      raise "Failed to insert document #{id} in index #{index}"
-    end
-  end
-
-  # Partially updates an existing document in Elasticsearch index
-  #   - index: Index to update the document in
-  #   - id: ElasticSearch identifier of the document
-  #   - document: New document contents
-  # Returns the updated document or nil if the document cannot be found.
-  # Otherwise, raises an error.
-  def update_document(index, id, document)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}/_doc/#{CGI::escape(id)}/_update")
-    req = Net::HTTP::Post.new(uri)
-    req_body = { "doc": document }.to_json
-    req.body = req_body
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPNotFound
-      @logger.info("ELASTICSEARCH") { "Cannot update document #{id} in index #{index} because it doesn't exist" }
-      nil
-    elsif resp.is_a? Net::HTTPSuccess
-      @logger.debug("ELASTICSEARCH") { "Updated document #{id} in index #{index}" }
-      JSON.parse resp.body
-    else
-      @logger.error("ELASTICSEARCH") { "Failed to update document #{id} in index #{index}.\nPOST #{uri}\nRequest: #{req_body}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      raise "Failed to update document #{id} in index #{index}"
-    end
-  end
-
-  # Updates the document with the given id in the given index.
-  # Inserts the document if it doesn't exist yet
-  # - index: index to store document in
-  # - id: elastic identifier to store the document under
-  # - document: document contents (as a ruby json object)
-  def upsert_document(index, id, document)
-    @logger.debug("ELASTICSEARCH") { "Trying to update document with id #{id}" }
-    updated_document = update_document index, id, document
-    if updated_document.nil?
-      @logger.debug("ELASTICSEARCH") { "Document #{id} does not exist yet, trying to insert new document" }
-      insert_document index, id, document
-    else
-      updated_document
-    end
-  end
-
-  # Deletes a document from an Elasticsearch index
-  #   - index: Index to remove the document from
-  #   - id: ElasticSearch identifier of the document
-  # Returns true when the document existed and is succesfully deleted.
-  # Otherwise false.
-  # Throws an error if the document exists but fails to be deleted.
-  def delete_document(index, id)
-    uri = URI("http://#{@host}:#{@port_s}/#{index}/_doc/#{CGI::escape(id)}")
-    req = Net::HTTP::Delete.new(uri)
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPNotFound
-      @logger.debug("ELASTICSEARCH") { "Document #{id} doesn't exist in index #{index} and cannot be deleted." }
-      false
-    elsif resp.is_a? Net::HTTPSuccess
-      @logger.debug("ELASTICSEARCH") { "Successfully deleted document #{id} in index #{index}" }
-      true
-    else
-      @logger.error("ELASTICSEARCH") { "Failed to delete document #{id} in index #{index}.\nDELETE #{uri}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      raise "Failed to delete document #{id} in index #{index}"
-    end
-  end
-
-  # Searches for documents in the given indexes
-  #   - indexes: Array of indexes to be searched
-  #   - query: Elasticsearch query JSON object in ruby format
-  def search_documents(indexes:, query: nil)
-    indexes_s = indexes.join(',')
-    uri = URI("http://#{@host}:#{@port_s}/#{indexes_s}/_search")
-    req_body = query.to_json
-    @logger.debug("SEARCH") { "Searching Elasticsearch index(es) #{indexes_s} with body #{req_body}" }
-    req = Net::HTTP::Post.new(uri)
-    req.body = req_body
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPSuccess
-      JSON.parse resp.body
-    else
-      @logger.error("SEARCH") { "Searching documents in index(es) #{indexes_s} failed.\nPOST #{uri}\nRequest: #{req_body}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      if resp.is_a? Net::HTTPClientError # 4xx status code
-        raise ArgumentError, "Invalid search query #{req_body}"
-      else
-        raise "Something went wrong while searching documents in index(es) #{indexes_s}"
-      end
-    end
-  end
-
-  # Counts search results for documents in the given indexex
-  #   - indexes: Array of indexes to be searched
-  #   - query: Elasticsearch query JSON object in ruby format
-  def count_documents(indexes:, query: nil)
-    indexes_s = indexes.join(',')
-    uri = URI("http://#{@host}:#{@port_s}/#{indexes_s}/_doc/_count")
-    req_body = query.to_json
-    @logger.debug("SEARCH") { "Count search results in index(es) #{indexes_s} for body #{req_body}" }
-    req = Net::HTTP::Get.new(uri)
-    req.body = req_body
-    resp = run(uri, req)
-
-    if resp.is_a? Net::HTTPSuccess
-      data = JSON.parse resp.body
-      data["count"]
-    else
-      @logger.error("SEARCH") { "Counting search results in index(es) #{indexes_s} failed.\nPOST #{uri}\nRequest: #{req_body}\nResponse: #{resp.code} #{resp.msg}\n#{resp.body}" }
-      if resp.is_a? Net::HTTPClientError # 4xx status code
-        raise ArgumentError, "Invalid search query #{req_body}"
-      else
-        raise "Something went wrong while counting search results in index(es) #{indexes_s}"
-      end
-    end
-  end
-
-  private
-
-  # Sends a raw request to Elasticsearch
-  #   - uri: URI instance representing the elasticSearch host
-  #   - req: The request object
-  #   - retries: Max number of retries
-  #
-  # Returns the HTTP response.
-  #
-  # Note: the method only logs limited info on purpose.
-  # Additional logging about the error that occurred
-  # is the responsibility of the consumer.
-  def run(uri, req, retries = 6)
-    def run_rescue(uri, req, retries, result = nil)
-      if retries == 0
-        if result.is_a? Exception
-          @logger.warn("ELASTICSEARCH") { "Failed to run request #{uri}. Max number of retries reached." }
-          raise result
-        else
-          @logger.info("ELASTICSEARCH") { "Failed to run request #{uri}. Max number of retries reached." }
-          result
-        end
-      else
-        @logger.info("ELASTICSEARCH") { "Failed to run request #{uri}. Request will be retried (#{retries} left)." }
-        next_retries = retries - 1
-        backoff = (6 - next_retries)**2
-        sleep backoff
-        run(uri, req, next_retries)
-      end
-    end
-
-    req["content-type"] = "application/json"
-
-    res = Net::HTTP.start(uri.hostname, uri.port) do |http|
-      http.read_timeout = ENV["ELASTIC_READ_TIMEOUT"].to_i
-      begin
-        http.request(req)
-      rescue Exception => e
-        run_rescue(uri, req, retries, e)
-      end
-    end
-
-    case res
-    when Net::HTTPSuccess, Net::HTTPRedirection # response code 2xx or 3xx
-      # Ruby doesn't use the encoding specified in HTTP headers (https://bugs.ruby-lang.org/issues/2567#note-3)
-      content_type = res["CONTENT-TYPE"]
-      if res.body && content_type && content_type.downcase.include?("charset=utf-8")
-        res.body.force_encoding("utf-8")
-      end
-      res
-    when Net::HTTPTooManyRequests
-      run_rescue(uri, req, retries, res)
-    else
-      @logger.info("ELASTICSEARCH") { "Failed to run request #{uri}" }
-      @logger.debug("ELASTICSEARCH") { "Request body (trimmed): #{req.body.to_s[0...1024]}" }
-      @logger.debug("ELASTICSEARCH") { "Response: #{res.inspect}" }
-      res
-    end
-  end
-
-  # Deletes all documents which match a certain query
-  #   - index: Index to delete the documents from
-  #   - query: ElasticSearch query used for selecting documents
-  #   - conflicts_proceed: boolean indicating whether to proceed deletion if
-  #     other operations are currently occurring on the same document or not.
-  #
-  # For the query formal, see https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-delete-by-query.html
-  def delete_documents_by_query(index, query, conflicts_proceed: true)
-    conflicts = conflicts_proceed ? 'conflicts=proceed' : ''
-    uri = URI("http://#{@host}:#{@port_s}/#{index}/_doc/_delete_by_query?#{conflicts}")
-    req = Net::HTTP::Post.new(uri)
-    req.body = query.to_json
-    run(uri, req)
-  end
-end
diff --git a/lib/mu_search/elastic.rb b/lib/mu_search/elastic.rb
new file mode 100644
index 0000000..0ca6469
--- /dev/null
+++ b/lib/mu_search/elastic.rb
@@ -0,0 +1,265 @@
+require 'elasticsearch'
+require 'faraday/typhoeus'
+
+# monkeypatch "authentic product check"" in client
+module Elasticsearch
+  class Client
+    alias original_verify_with_version_or_header verify_with_version_or_header
+
+    def verify_with_version_or_header(...)
+      original_verify_with_version_or_header(...)
+    rescue Elasticsearch::UnsupportedProductError
+      # silenty ignore this error
+    end
+  end
+end
+
+# A wrapper around elasticsearch client for backwards compatiblity
+# see https://rubydoc.info/gems/elasticsearch-api/Elasticsearch
+# and https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/examples.html
+# for docs on the client api
+##
+module MuSearch
+  class Elastic
+    attr_reader :client
+    # Sets up the ElasticSearch instance
+    def initialize(host: "localhost", port: 9200, logger:)
+      @logger = logger
+      @client = Elasticsearch::Client.new(host: host, port: port)
+    end
+
+    # Checks whether or not ElasticSearch is up
+    #
+    # Executes a health check and accepts either "green" or "yellow".
+    def up?
+      begin
+        health = client.cluster.health
+        health["status"] == "yellow" or health["status"] == "green"
+      rescue
+        false
+      end
+    end
+
+    # Checks whether or not the supplied index exists.
+    #   - index: string name of the index
+    #
+    # Executes a HEAD request. If that succeeds we can assume the index
+    # exists.
+    def index_exists?(index)
+      begin
+        client.indices.exists?(index: index)
+      rescue StandardError => e
+        @logger.warn("ELASTICSEARCH") { "Error while checking if index #{index} exists. Assuming it doesn't." }
+        @logger.warn("ELASTICSEARCH") { e.full_message }
+        false
+      end
+    end
+
+    # Creates an index in Elasticsearch
+    #   - index: Index to be created
+    #   - mappings: Optional pre-defined document mappings for the index,
+    #     JSON object passed directly to Elasticsearch.
+    #   - settings: Optional JSON object passed directly to Elasticsearch
+    def create_index(index, mappings = nil, settings = nil)
+      begin
+        client.indices.create(index: index, body: { settings: settings, mappings: mappings})
+      rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
+        error_message = e.message
+        if error_message.include?("resource_already_exists_exception")
+          @logger.warn("ELASTICSEARCH") {"Failed to create index #{index}, because it already exists" }
+        else
+          @logger.error("ELASTICSEARCH") {"Failed to create index #{index}, error: #{error_message}" }
+          raise e
+        end
+      rescue StandardError => e
+        @logger.error("Failed to create index #{index}\n  Error: #{e.full_message}")
+        raise e
+      end
+    end
+
+    # Deletes an index from ElasticSearch
+    #   - index: Name of the index to be removed
+    #
+    # Returns true when the index existed and is succesfully deleted.
+    # Otherwise false.
+    # Throws an error if the index exists but fails to be deleted.
+    def delete_index(index)
+      begin
+        client.indices.delete(index: index)
+        @logger.debug("ELASTICSEARCH") { "Successfully deleted index #{index}" }
+        true
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        @logger.debug("ELASTICSEARCH") { "Index #{index} doesn't exist and cannot be deleted." }
+        false
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to delete index #{index}. Error: #{e.message}" }
+        raise "Failed to delete index #{index}: #{e.message}"
+      end
+    end
+
+    # Refreshes an ElasticSearch index, making documents available for
+    # search.
+    #   - index: Name of the index which will be refreshed.
+    #
+    # Returns whether the refresh succeeded
+    #
+    # When we store documents in ElasticSearch, they are not necessarily
+    # available immediately. It requires a refresh of the index. This
+    # operation happens once every second. When we build an index to
+    # query it immediately, we should ensure to refresh the index before
+    # querying.
+    def refresh_index(index)
+      begin
+        client.indices.refresh(index: index)
+        @logger.debug("ELASTICSEARCH") { "Successfully refreshed index #{index}" }
+        true
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        @logger.warn("ELASTICSEARCH") { "Index #{index} does not exist, cannot refresh." }
+        false
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to refresh index #{index}. Error: #{e.full_message}" }
+        false
+      end
+    end
+
+    # Clear a given index by deleting all documents in the Elasticsearch index
+    #   - index: Index name to clear
+    # Note: this operation does not delete the index in Elasticsearch
+    def clear_index(index)
+      begin
+        # The `query: { match_all: {} }` deletes all documents in the index.
+        client.delete_by_query(index: index, body: { query: { match_all: {} } })
+        @logger.debug("ELASTICSEARCH") { "Successfully cleared all documents from index #{index}" }
+        true
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        @logger.warn("ELASTICSEARCH") { "Index #{index} does not exist, cannot clear documents." }
+        false
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to clear documents in index #{index}. Error: #{e.message}" }
+        raise e
+      end
+    end
+
+    # Gets a single document from an index by its ElasticSearch id.
+    # Returns nil if the document cannot be found.
+    #   - index: Index to retrieve the document from
+    #   - id: ElasticSearch ID of the document
+    def get_document(index, id)
+      begin
+        client.get(index: index, id: id)
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        @logger.debug("ELASTICSEARCH") { "Document #{id} not found in index #{index}" }
+        nil
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to get document #{id} from index #{index}.\n Error: #{e.full_message}" }
+        raise e
+      end
+    end
+
+    # Inserts a new document in an Elasticsearch index
+    #   - index: Index to store the document in.
+    #   - id: Elasticsearch identifier to store the document under.
+    #   - document: document contents to index (as a ruby json object)
+    # Returns the inserted document
+    # Raises an error on failure.
+    def insert_document(index, id, document)
+      begin
+        body = client.index(index: index, id: id, body: document)
+        @logger.debug("ELASTICSEARCH") { "Inserted document #{id} in index #{index}" }
+        body
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to insert document #{id} in index #{index}.\n  Error: #{e.full_message}" }
+        raise e
+      end
+    end
+
+    # Partially updates an existing document in Elasticsearch index
+    #   - index: Index to update the document in
+    #   - id: ElasticSearch identifier of the document
+    #   - document: New document contents
+    # Returns the updated document or nil if the document cannot be found.
+    # Otherwise, raises an error.
+    def update_document(index, id, document)
+      begin
+        body = client.update(index: index, id: id, body: {doc: document})
+        @logger.debug("ELASTICSEARCH") { "Updated document #{id} in index #{index}" }
+        body
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        @logger.info("ELASTICSEARCH") { "Cannot update document #{id} in index #{index} because it doesn't exist" }
+        nil
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to update document #{id} in index #{index}.\n Error: #{e.full_message}" }
+        raise e
+      end
+    end
+
+    # Updates the document with the given id in the given index.
+    # Inserts the document if it doesn't exist yet
+    # - index: index to store document in
+    # - id: elastic identifier to store the document under
+    # - document: document contents (as a ruby json object)
+    def upsert_document(index, id, document)
+      @logger.debug("ELASTICSEARCH") { "Trying to update document with id #{id}" }
+      updated_document = update_document index, id, document
+      if updated_document.nil?
+        @logger.debug("ELASTICSEARCH") { "Document #{id} does not exist yet, trying to insert new document" }
+        insert_document index, id, document
+      else
+        updated_document
+      end
+    end
+
+    # Deletes a document from an Elasticsearch index
+    #   - index: Index to remove the document from
+    #   - id: ElasticSearch identifier of the document
+    # Returns true when the document existed and is succesfully deleted.
+    # Otherwise false.
+    # Throws an error if the document exists but fails to be deleted.
+    def delete_document(index, id)
+      begin
+        client.delete(index: index, id: id)
+        @logger.debug("ELASTICSEARCH") { "Successfully deleted document #{id} in index #{index}" }
+        true
+      rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        @logger.debug("ELASTICSEARCH") { "Document #{id} doesn't exist in index #{index} and cannot be deleted." }
+        false
+      rescue StandardError => e
+        @logger.error("ELASTICSEARCH") { "Failed to dele document #{id} in index #{index}.\n Error: #{e.full_message}" }
+        raise e
+      end
+    end
+
+    # Searches for documents in the given indexes
+    #   - indexes: Array of indexes to be searched
+    #   - query: Elasticsearch query JSON object in ruby format
+    def search_documents(indexes:, query: nil)
+      begin
+        @logger.debug("SEARCH") { "Searching Elasticsearch index(es) #{indexes} with body #{req_body}" }
+        client.search(index: indexes, body: query)
+      rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
+        raise ArgumentError, "Invalid search query #{query}"
+      rescue StandardError => e
+        @logger.error("SEARCH") { "Searching documents in index(es) #{indexes} failed.\n Error: #{e.full_message}" }
+        raise e
+      end
+    end
+
+    # Counts search results for documents in the given indexex
+    #   - indexes: Array of indexes to be searched
+    #   - query: Elasticsearch query JSON object in ruby format
+    def count_documents(indexes:, query: nil)
+      begin
+        @logger.debug("SEARCH") { "Count search results in index(es) #{indexes} for body #{req_body}" }
+        puts query.inspect
+        response = client.count(index: indexes, body: query)
+        response["count"]
+      rescue Elasticsearch::Transport::Transport::Errors::BadRequest => e
+        @logger.error("SEARCH") { "Counting search results in index(es) #{indexes} failed.\n Error: #{e.full_message}" }
+        raise ArgumentError, "Invalid count query #{query}"
+      rescue StandardError => e
+        @logger.error("SEARCH") { "Counting search results in index(es) #{indexes} failed.\n Error: #{e.full_message}" }
+        raise e
+      end
+    end
+  end
+end
diff --git a/lib/mu_search/sparql.rb b/lib/mu_search/sparql.rb
index 0b70aa9..db87753 100644
--- a/lib/mu_search/sparql.rb
+++ b/lib/mu_search/sparql.rb
@@ -1,4 +1,3 @@
-require 'request_store'
 module MuSearch
   module SPARQL
     class ClientWrapper
diff --git a/web.rb b/web.rb
index f1efa30..4da1cf3 100644
--- a/web.rb
+++ b/web.rb
@@ -1,11 +1,3 @@
-require 'net/http'
-require 'digest'
-require 'set'
-require 'request_store'
-require 'listen'
-require 'singleton'
-require 'base64'
-require 'open3'
 require 'webrick'
 
 require_relative 'lib/logger.rb'
@@ -20,11 +12,12 @@
 require_relative 'lib/mu_search/index_builder.rb'
 require_relative 'lib/mu_search/search_index.rb'
 require_relative 'lib/mu_search/index_manager.rb'
-require_relative 'framework/elastic.rb'
+require_relative 'lib/mu_search/elastic.rb'
 require_relative 'framework/elastic_query_builder.rb'
 require_relative 'framework/tika.rb'
 require_relative 'framework/jsonapi.rb'
 
+
 ##
 # WEBrick setup
 ##
@@ -112,7 +105,7 @@ def setup_delta_handling(index_manager, elasticsearch, tika, sparql_connection_p
     logger: Mu::log
   )
 
-  elasticsearch = Elastic.new(
+  elasticsearch = MuSearch::Elastic.new(
     host: 'elasticsearch',
     port: 9200,
     logger: Mu::log