Refactored event storage to ExtensionTracker only.