More work on ExtensionManager