Changes to include auto updating ES