Moved ElasticSearch interaction into DAOs