Changed implementation to use class to handle es store updates