Add elasticsearch support