Convert to use Elastic Search provider