Add Elastic Search support