Changes to EventRegistry