Updates to ES client