Add Elastic search support \o/