Refactoring - One global ESClient for all plugins