Added preliminary elasticsearch support