Adapt to ES client API modifications