Add elastic-search engine support