diff --git a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index ff567a52..9224339f 100644
--- a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -41,7 +41,7 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:passepartoutvpn/passepartoutkit-source",
       "state" : {
-        "revision" : "e7bd9636ac31d6111b0bc7c171398e68eeb384b5"
+        "revision" : "fe192115ca6f8e49447717dbe0a64347bd722aec"
       }
     },
     {
diff --git a/Passepartout/App/AppDelegate.swift b/Passepartout/App/AppDelegate.swift
index 594ba0df..2e244fe6 100644
--- a/Passepartout/App/AppDelegate.swift
+++ b/Passepartout/App/AppDelegate.swift
@@ -35,7 +35,7 @@ final class AppDelegate: NSObject {
 
     func configure(with uiConfiguring: UILibraryConfiguring) {
         UILibrary(uiConfiguring)
-            .configure()
+            .configure(with: context)
 
         Task {
             pp_log(.app, .notice, "Fetch providers index...")
diff --git a/Passepartout/Library/Package.swift b/Passepartout/Library/Package.swift
index 76c30b09..baa18233 100644
--- a/Passepartout/Library/Package.swift
+++ b/Passepartout/Library/Package.swift
@@ -15,7 +15,10 @@ let package = Package(
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "AppUI",
-            targets: ["AppUI"]
+            targets: [
+                "AppUI",
+                "PassepartoutImplementations"
+            ]
         ),
         .library(
             name: "AppUIMain",
@@ -31,7 +34,10 @@ let package = Package(
         ),
         .library(
             name: "TunnelLibrary",
-            targets: ["CommonLibrary"]
+            targets: [
+                "CommonLibrary",
+                "PassepartoutImplementations"
+            ]
         ),
         .library(
             name: "UILibrary",
@@ -40,7 +46,7 @@ let package = Package(
     ],
     dependencies: [
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"),
-        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "e7bd9636ac31d6111b0bc7c171398e68eeb384b5"),
+        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "fe192115ca6f8e49447717dbe0a64347bd722aec"),
 //        .package(path: "../../../passepartoutkit-source"),
         .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.9.1"),
 //        .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"),
@@ -109,9 +115,7 @@ let package = Package(
             name: "CommonLibrary",
             dependencies: [
                 "CommonUtils",
-                .product(name: "PassepartoutKit", package: "passepartoutkit-source"),
-                .product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-source-openvpn-openssl"),
-                .product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-source-wireguard-go")
+                .product(name: "PassepartoutKit", package: "passepartoutkit-source")
             ],
             resources: [
                 .process("Resources")
@@ -131,6 +135,13 @@ let package = Package(
                 .process("Profiles.xcdatamodeld")
             ]
         ),
+        .target(
+            name: "PassepartoutImplementations",
+            dependencies: [
+                .product(name: "PassepartoutOpenVPNOpenSSL", package: "passepartoutkit-source-openvpn-openssl"),
+                .product(name: "PassepartoutWireGuardGo", package: "passepartoutkit-source-wireguard-go")
+            ]
+        ),
         .target(
             name: "UILibrary",
             dependencies: [
diff --git a/Passepartout/Library/Sources/AppUIMain/AppUIMain.swift b/Passepartout/Library/Sources/AppUIMain/AppUIMain.swift
index 62eba68c..ab87d5c6 100644
--- a/Passepartout/Library/Sources/AppUIMain/AppUIMain.swift
+++ b/Passepartout/Library/Sources/AppUIMain/AppUIMain.swift
@@ -24,24 +24,25 @@
 //
 
 import Foundation
+import PassepartoutKit
 @_exported import UILibrary
 
 public final class AppUIMain: UILibraryConfiguring {
     public init() {
     }
 
-    public func configure() {
-        assertMissingImplementations()
+    public func configure(with context: AppContext) {
+        assertMissingImplementations(with: context.registry)
     }
 }
 
 private extension AppUIMain {
-    func assertMissingImplementations() {
+    func assertMissingImplementations(with registry: Registry) {
         let providerModuleTypes: Set<ModuleType> = [
             .openVPN
         ]
         ModuleType.allCases.forEach { moduleType in
-            let builder = moduleType.newModule()
+            let builder = moduleType.newModule(with: registry)
             guard builder is any ModuleViewProviding else {
                 fatalError("\(moduleType): is not ModuleViewProviding")
             }
diff --git a/Passepartout/Library/Sources/AppUIMain/Extensions/EditableModule+Previews.swift b/Passepartout/Library/Sources/AppUIMain/Extensions/EditableModule+Previews.swift
index f3819236..75042d7a 100644
--- a/Passepartout/Library/Sources/AppUIMain/Extensions/EditableModule+Previews.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Extensions/EditableModule+Previews.swift
@@ -31,7 +31,7 @@ extension ModuleBuilder where Self: ModuleViewProviding {
     @MainActor
     func preview(title: String = "") -> some View {
         NavigationStack {
-            moduleView(with: ProfileEditor(modules: [self]))
+            moduleView(with: ProfileEditor(modules: [self]), impl: nil)
                 .navigationTitle(title)
         }
         .withMockEnvironment()
diff --git a/Passepartout/Library/Sources/AppUIMain/Protocols/DefaultModuleViewFactory.swift b/Passepartout/Library/Sources/AppUIMain/Protocols/DefaultModuleViewFactory.swift
index 847f0a32..f488725a 100644
--- a/Passepartout/Library/Sources/AppUIMain/Protocols/DefaultModuleViewFactory.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Protocols/DefaultModuleViewFactory.swift
@@ -28,19 +28,24 @@ import PassepartoutKit
 import SwiftUI
 
 final class DefaultModuleViewFactory: ModuleViewFactory {
+    private let registry: Registry
+
+    init(registry: Registry) {
+        self.registry = registry
+    }
 
     @ViewBuilder
     func view(with editor: ProfileEditor, moduleId: UUID) -> some View {
-        let result = editor.moduleViewProvider(withId: moduleId)
+        let result = editor.moduleViewProvider(withId: moduleId, registry: registry)
         if let result {
-            AnyView(result.provider.moduleView(with: editor))
+            AnyView(result.provider.moduleView(with: editor, impl: result.impl))
                 .navigationTitle(result.title)
         }
     }
 }
 
 private extension ProfileEditor {
-    func moduleViewProvider(withId moduleId: UUID) -> (provider: any ModuleViewProviding, title: String)? {
+    func moduleViewProvider(withId moduleId: UUID, registry: Registry) -> ModuleViewProviderResult? {
         guard let module = module(withId: moduleId) else {
 //            assertionFailure("No module with ID \(moduleId)")
             return nil
@@ -49,6 +54,18 @@ private extension ProfileEditor {
             assertionFailure("\(type(of: module)) does not provide a default view")
             return nil
         }
-        return (provider, module.moduleType.localizedDescription)
+        return ModuleViewProviderResult(
+            title: module.moduleType.localizedDescription,
+            provider: provider,
+            impl: registry.implementation(for: module)
+        )
     }
 }
+
+private struct ModuleViewProviderResult {
+    let title: String
+
+    let provider: any ModuleViewProviding
+
+    let impl: ModuleImplementation?
+}
diff --git a/Passepartout/Library/Sources/AppUIMain/Protocols/ModuleViewProviding.swift b/Passepartout/Library/Sources/AppUIMain/Protocols/ModuleViewProviding.swift
index b64fdc91..36c2a7ac 100644
--- a/Passepartout/Library/Sources/AppUIMain/Protocols/ModuleViewProviding.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Protocols/ModuleViewProviding.swift
@@ -23,11 +23,12 @@
 //  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+import PassepartoutKit
 import SwiftUI
 
 protocol ModuleViewProviding {
     associatedtype Content: View
 
     @MainActor
-    func moduleView(with editor: ProfileEditor) -> Content
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> Content
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift b/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
index f5dd281b..3a6c0792 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/App/AppCoordinator.swift
@@ -157,7 +157,8 @@ extension AppCoordinator {
             ProfileCoordinator(
                 profileManager: profileManager,
                 profileEditor: profileEditor,
-                moduleViewFactory: DefaultModuleViewFactory(),
+                registry: registry,
+                moduleViewFactory: DefaultModuleViewFactory(registry: registry),
                 modally: true,
                 path: $profilePath,
                 onDismiss: {
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/DNSModule+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/DNSModule+Extensions.swift
index 45afa7cf..57441abe 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/DNSModule+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/DNSModule+Extensions.swift
@@ -27,7 +27,7 @@ import PassepartoutKit
 import SwiftUI
 
 extension DNSModule.Builder: ModuleViewProviding {
-    func moduleView(with editor: ProfileEditor) -> some View {
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> some View {
         DNSView(editor: editor, module: self)
     }
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/HTTPProxyModule+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/HTTPProxyModule+Extensions.swift
index 305a419a..9593b339 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/HTTPProxyModule+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/HTTPProxyModule+Extensions.swift
@@ -27,7 +27,7 @@ import PassepartoutKit
 import SwiftUI
 
 extension HTTPProxyModule.Builder: ModuleViewProviding {
-    func moduleView(with editor: ProfileEditor) -> some View {
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> some View {
         HTTPProxyView(editor: editor, module: self)
     }
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/IPModule+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/IPModule+Extensions.swift
index 4ab413fe..2c0d0326 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/IPModule+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/IPModule+Extensions.swift
@@ -27,7 +27,7 @@ import PassepartoutKit
 import SwiftUI
 
 extension IPModule.Builder: ModuleViewProviding {
-    func moduleView(with editor: ProfileEditor) -> some View {
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> some View {
         IPView(editor: editor, module: self)
     }
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OnDemandModule+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OnDemandModule+Extensions.swift
index eb6b0e7b..574f61eb 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OnDemandModule+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OnDemandModule+Extensions.swift
@@ -27,7 +27,7 @@ import PassepartoutKit
 import SwiftUI
 
 extension OnDemandModule.Builder: ModuleViewProviding {
-    func moduleView(with editor: ProfileEditor) -> some View {
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> some View {
         OnDemandView(editor: editor, module: self)
     }
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OpenVPNModule+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OpenVPNModule+Extensions.swift
index 2171c415..7b00e34d 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OpenVPNModule+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/OpenVPNModule+Extensions.swift
@@ -28,8 +28,8 @@ import PassepartoutKit
 import SwiftUI
 
 extension OpenVPNModule.Builder: ModuleViewProviding {
-    func moduleView(with editor: ProfileEditor) -> some View {
-        OpenVPNView(editor: editor, module: self)
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> some View {
+        OpenVPNView(editor: editor, module: self, impl: impl as? OpenVPNModule.Implementation)
     }
 }
 
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/WireGuardModule+Extensions.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/WireGuardModule+Extensions.swift
index 1cdccd81..4eda2474 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/WireGuardModule+Extensions.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/Extensions/WireGuardModule+Extensions.swift
@@ -27,7 +27,7 @@ import PassepartoutKit
 import SwiftUI
 
 extension WireGuardModule.Builder: ModuleViewProviding {
-    func moduleView(with editor: ProfileEditor) -> some View {
-        WireGuardView(editor: editor, module: self)
+    func moduleView(with editor: ProfileEditor, impl: ModuleImplementation?) -> some View {
+        WireGuardView(editor: editor, module: self, impl: impl as? WireGuardModule.Implementation)
     }
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
index 11d3d917..0717b6a8 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/OpenVPNView.swift
@@ -25,7 +25,6 @@
 
 import CommonLibrary
 import CommonUtils
-import CPassepartoutOpenVPNOpenSSL
 import PassepartoutKit
 import SwiftUI
 
@@ -39,6 +38,8 @@ struct OpenVPNView: View, ModuleDraftEditing {
 
     let module: OpenVPNModule.Builder
 
+    let impl: OpenVPNModule.Implementation?
+
     private let isServerPushed: Bool
 
     @State
@@ -66,12 +67,14 @@ struct OpenVPNView: View, ModuleDraftEditing {
 
         self.editor = editor
         self.module = module
+        impl = nil
         isServerPushed = true
     }
 
-    init(editor: ProfileEditor, module: OpenVPNModule.Builder) {
+    init(editor: ProfileEditor, module: OpenVPNModule.Builder, impl: OpenVPNModule.Implementation?) {
         self.editor = editor
         self.module = module
+        self.impl = impl
         isServerPushed = false
     }
 
@@ -179,8 +182,13 @@ private extension OpenVPNView {
             }
             importURL = url
 
-            let parsed = try StandardOpenVPNParser(decrypter: OSSLTLSBox())
-                .parsed(fromURL: url, passphrase: importPassphrase)
+            guard let impl else {
+                fatalError("Requires OpenVPNModule implementation")
+            }
+            guard let parser = impl.importer as? StandardOpenVPNParser else {
+                fatalError("OpenVPNModule importer should be StandardOpenVPNParser")
+            }
+            let parsed = try parser.parsed(fromURL: url, passphrase: importPassphrase)
 
             draft.wrappedValue.configurationBuilder = parsed.configuration.builder()
         } catch StandardOpenVPNParserError.encryptionPassphrase,
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Modules/WireGuardView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Modules/WireGuardView.swift
index 0d7cf516..0a3494a6 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Modules/WireGuardView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Modules/WireGuardView.swift
@@ -25,7 +25,6 @@
 
 import CommonLibrary
 import PassepartoutKit
-import PassepartoutWireGuardGo
 import SwiftUI
 
 struct WireGuardView: View, ModuleDraftEditing {
@@ -35,6 +34,8 @@ struct WireGuardView: View, ModuleDraftEditing {
 
     let module: WireGuardModule.Builder
 
+    let impl: WireGuardModule.Implementation?
+
     var body: some View {
         contentView
             .moduleView(editor: editor, draft: draft.wrappedValue)
@@ -45,7 +46,10 @@ struct WireGuardView: View, ModuleDraftEditing {
 
 private extension WireGuardView {
     var configuration: WireGuard.Configuration.Builder {
-        draft.wrappedValue.configurationBuilder ?? .default
+        guard let impl else {
+            fatalError("Requires WireGuardModule implementation")
+        }
+        return draft.wrappedValue.configurationBuilder ?? .init(keyGenerator: impl.keyGenerator)
     }
 
     @ViewBuilder
@@ -143,7 +147,7 @@ private extension WireGuardView {
 
 // swiftlint: disable force_try
 #Preview {
-    let gen = StandardWireGuardKeyGenerator()
+    let gen = MockGenerator()
 
     var builder = WireGuard.Configuration.Builder(keyGenerator: gen)
     builder.interface.addresses = ["1.1.1.1", "2.2.2.2"]
@@ -166,3 +170,21 @@ private extension WireGuardView {
     return module.preview()
 }
 // swiftlint: enable force_try
+
+private final class MockGenerator: WireGuardKeyGenerator {
+    func newPrivateKey() -> String {
+        "private-key"
+    }
+
+    func privateKey(from string: String) throws -> String {
+        "private-key"
+    }
+
+    func publicKey(from string: String) throws -> String {
+        "public-key"
+    }
+
+    func publicKey(for privateKey: String) throws -> String {
+        "public-key"
+    }
+}
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Profile/ModuleDetailView.swift b/Passepartout/Library/Sources/AppUIMain/Views/Profile/ModuleDetailView.swift
index 66d58f27..bd8c546a 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Profile/ModuleDetailView.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Profile/ModuleDetailView.swift
@@ -62,7 +62,7 @@ private extension ModuleDetailView {
     ModuleDetailView(
         profileEditor: ProfileEditor(profile: .mock),
         moduleId: Profile.mock.modules.first?.id,
-        moduleViewFactory: DefaultModuleViewFactory()
+        moduleViewFactory: DefaultModuleViewFactory(registry: Registry())
     )
     .withMockEnvironment()
 }
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift b/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
index 5a6b12ed..c2a7d5ef 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Profile/ProfileCoordinator.swift
@@ -47,6 +47,8 @@ struct ProfileCoordinator: View {
 
     let profileEditor: ProfileEditor
 
+    let registry: Registry
+
     let moduleViewFactory: any ModuleViewFactory
 
     let modally: Bool
@@ -125,7 +127,7 @@ private extension ProfileCoordinator {
             return
         }
 
-        let module = moduleType.newModule()
+        let module = moduleType.newModule(with: registry)
         withAnimation(theme.animation(for: .modules)) {
             profileEditor.saveModule(module, activating: true)
         }
@@ -152,7 +154,8 @@ private extension ProfileCoordinator {
     ProfileCoordinator(
         profileManager: .mock,
         profileEditor: ProfileEditor(profile: .newMockProfile()),
-        moduleViewFactory: DefaultModuleViewFactory(),
+        registry: Registry(),
+        moduleViewFactory: DefaultModuleViewFactory(registry: Registry()),
         modally: false,
         path: .constant(NavigationPath()),
         onDismiss: {}
diff --git a/Passepartout/Library/Sources/AppUIMain/Views/Profile/macOS/ProfileSplitView+macOS.swift b/Passepartout/Library/Sources/AppUIMain/Views/Profile/macOS/ProfileSplitView+macOS.swift
index 718f41cd..83827ad9 100644
--- a/Passepartout/Library/Sources/AppUIMain/Views/Profile/macOS/ProfileSplitView+macOS.swift
+++ b/Passepartout/Library/Sources/AppUIMain/Views/Profile/macOS/ProfileSplitView+macOS.swift
@@ -123,7 +123,7 @@ private extension ProfileSplitView {
 #Preview {
     ProfileSplitView(
         profileEditor: ProfileEditor(profile: .newMockProfile()),
-        moduleViewFactory: DefaultModuleViewFactory()
+        moduleViewFactory: DefaultModuleViewFactory(registry: Registry())
     )
     .withMockEnvironment()
 }
diff --git a/Passepartout/Library/Sources/AppUITV/AppUITV.swift b/Passepartout/Library/Sources/AppUITV/AppUITV.swift
index e3063253..7c6d1aa8 100644
--- a/Passepartout/Library/Sources/AppUITV/AppUITV.swift
+++ b/Passepartout/Library/Sources/AppUITV/AppUITV.swift
@@ -30,6 +30,6 @@ public final class AppUITV: UILibraryConfiguring {
     public init() {
     }
 
-    public func configure() {
+    public func configure(with context: AppContext) {
     }
 }
diff --git a/Passepartout/Library/Sources/CommonLibrary/Shared.swift b/Passepartout/Library/Sources/CommonLibrary/Shared.swift
index f141a862..7104b8f2 100644
--- a/Passepartout/Library/Sources/CommonLibrary/Shared.swift
+++ b/Passepartout/Library/Sources/CommonLibrary/Shared.swift
@@ -25,7 +25,6 @@
 
 import Foundation
 import PassepartoutKit
-import PassepartoutWireGuardGo
 
 extension LoggerDestination {
     public static let app = LoggerDestination(category: "app")
@@ -37,12 +36,6 @@ extension LoggerDestination {
     }
 }
 
-extension WireGuard.Configuration.Builder {
-    public static var `default`: Self {
-        .init(keyGenerator: StandardWireGuardKeyGenerator())
-    }
-}
-
 // TODO: #716, move to Environment
 extension Constants {
     public static let shared = Bundle.module.unsafeDecode(Constants.self, filename: "Constants")
diff --git a/Passepartout/Library/Sources/PassepartoutImplementations/Dummy.swift b/Passepartout/Library/Sources/PassepartoutImplementations/Dummy.swift
new file mode 100644
index 00000000..4034f54a
--- /dev/null
+++ b/Passepartout/Library/Sources/PassepartoutImplementations/Dummy.swift
@@ -0,0 +1,26 @@
+//
+//  Dummy.swift
+//  Passepartout
+//
+//  Created by Davide De Rosa on 11/8/24.
+//  Copyright (c) 2024 Davide De Rosa. All rights reserved.
+//
+//  https://github.com/passepartoutvpn
+//
+//  This file is part of Passepartout.
+//
+//  Passepartout is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Passepartout is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
diff --git a/Passepartout/Library/Sources/UILibrary/Domain/ModuleType+New.swift b/Passepartout/Library/Sources/UILibrary/Domain/ModuleType+New.swift
index 3063e615..67a58822 100644
--- a/Passepartout/Library/Sources/UILibrary/Domain/ModuleType+New.swift
+++ b/Passepartout/Library/Sources/UILibrary/Domain/ModuleType+New.swift
@@ -27,13 +27,17 @@ import Foundation
 import PassepartoutKit
 
 extension ModuleType {
-    public func newModule() -> any ModuleBuilder {
+    public func newModule(with registry: Registry) -> any ModuleBuilder {
         switch self {
         case .openVPN:
             return OpenVPNModule.Builder()
 
         case .wireGuard:
-            return WireGuardModule.Builder(configurationBuilder: .default)
+            let impl = registry.implementation(for: WireGuardModule.moduleHandler.id)
+            guard let wireGuard = impl as? WireGuardModule.Implementation else {
+                fatalError("Missing WireGuardModule implementation from Registry?")
+            }
+            return WireGuardModule.Builder(configurationBuilder: .init(keyGenerator: wireGuard.keyGenerator))
 
         case .dns:
             return DNSModule.Builder()
diff --git a/Passepartout/Library/Sources/UILibrary/Domain/ModuleType.swift b/Passepartout/Library/Sources/UILibrary/Domain/ModuleType.swift
index 1c5aad64..9f02999c 100644
--- a/Passepartout/Library/Sources/UILibrary/Domain/ModuleType.swift
+++ b/Passepartout/Library/Sources/UILibrary/Domain/ModuleType.swift
@@ -25,7 +25,6 @@
 
 import Foundation
 import PassepartoutKit
-import PassepartoutWireGuardGo
 
 public struct ModuleType: RawRepresentable, Hashable {
     public let rawValue: String
diff --git a/Passepartout/Library/Sources/UILibrary/UILibrary.swift b/Passepartout/Library/Sources/UILibrary/UILibrary.swift
index e4df1240..223c6d31 100644
--- a/Passepartout/Library/Sources/UILibrary/UILibrary.swift
+++ b/Passepartout/Library/Sources/UILibrary/UILibrary.swift
@@ -30,7 +30,7 @@ import PassepartoutKit
 
 @MainActor
 public protocol UILibraryConfiguring {
-    func configure()
+    func configure(with context: AppContext)
 }
 
 public final class UILibrary: UILibraryConfiguring {
@@ -40,12 +40,12 @@ public final class UILibrary: UILibraryConfiguring {
         self.uiConfiguring = uiConfiguring
     }
 
-    public func configure() {
+    public func configure(with context: AppContext) {
         PassepartoutConfiguration.shared.configureLogging(
             to: BundleConfiguration.urlForAppLog,
             parameters: Constants.shared.log,
             logsPrivateData: UserDefaults.appGroup.bool(forKey: AppPreference.logsPrivateData.key)
         )
-        uiConfiguring?.configure()
+        uiConfiguring?.configure(with: context)
     }
 }
diff --git a/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift b/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
index 5a0cd3af..cd7a6cc9 100644
--- a/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
+++ b/Passepartout/Library/Tests/UILibraryTests/ProfileEditorTests.swift
@@ -255,3 +255,9 @@ extension ProfileEditorTests {
         await fulfillment(of: [exp])
     }
 }
+
+private extension WireGuard.Configuration.Builder {
+    static var `default`: WireGuard.Configuration.Builder {
+        WireGuard.Configuration.Builder(privateKey: "")
+    }
+}
diff --git a/Passepartout/Shared/Shared.swift b/Passepartout/Shared/Shared.swift
index 9d3e56fd..44ac3af2 100644
--- a/Passepartout/Shared/Shared.swift
+++ b/Passepartout/Shared/Shared.swift
@@ -55,6 +55,7 @@ extension Registry {
                 }
             ),
             WireGuardModule.Implementation(
+                keyGenerator: StandardWireGuardKeyGenerator(),
                 importer: StandardWireGuardParser(),
                 connectionBlock: { parameters, module in
                     try GoWireGuardConnection(parameters: parameters, module: module)