Feature/elastic search support