Added elasticsearch  support