Refactored function storage to ExtensionTracker only.