Replaced EventRateStore from previous version