More changes to ESClient and ESManager