Refactored ExtensionManager