Added elasticsearch support