Feature/elasticsearch v2