added elastic search support