diff --git a/dist/index.d.ts b/dist/index.d.ts
index cd05d01..fdb4e88 100644
--- a/dist/index.d.ts
+++ b/dist/index.d.ts
@@ -1,6 +1,19 @@
-import { ResolverModuleConstructor } from "./resolverRegistry.js";
-export declare function setup(rm: ResolverModuleConstructor): void;
-export * from "./resolverRegistry.js";
+import type { DNSResult } from "@lumeweb/libresolver";
+import { DnsClient } from "@lumeweb/kernel-dns-client";
+import { ResolverOptions } from "@lumeweb/libresolver/src/types.js";
+export interface ResolverModule {
+  get resolver(): DnsClient;
+  set resolver(value: DnsClient);
+  resolve(
+    domain: string,
+    options: ResolverOptions,
+    bypassCache: boolean
+  ): Promise<DNSResult>;
+  getSupportedTlds(): string[];
+  getSupportedTlds(): Promise<string[]>;
+  getSupportedTlds(): any;
+}
+export declare function setup(rm: ResolverModule): void;
 export * from "@lumeweb/libresolver/dist/util.js";
 export * from "@lumeweb/libresolver/dist/types.js";
 export { AbstractResolverModule } from "@lumeweb/libresolver/dist/resolverModule.js";
diff --git a/dist/index.js b/dist/index.js
index 35409ff..2875d16 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1,5 +1,4 @@
 import { addHandler, handleMessage } from "libkmodule";
-import { ResolverRegistry, } from "./resolverRegistry.js";
 import { DNS_RECORD_TYPE } from "@lumeweb/libresolver";
 import { dnsClient } from "./client.js";
 let resolver;
@@ -8,7 +7,8 @@ export function setup(rm) {
     addHandler("register", handleRegister);
     addHandler("getSupportedTlds", handleGetSupportedTlds);
     onmessage = handleMessage;
-    resolver = new rm(new ResolverRegistry());
+    resolver = rm;
+    resolver.resolver = dnsClient;
 }
 async function handleRegister(aq) {
     await dnsClient.register();
@@ -36,7 +36,6 @@ async function handleResolve(aq) {
 function handleGetSupportedTlds(aq) {
     aq.respond(resolver.getSupportedTlds());
 }
-export * from "./resolverRegistry.js";
 export * from "@lumeweb/libresolver/dist/util.js";
 export * from "@lumeweb/libresolver/dist/types.js";
 export { AbstractResolverModule } from "@lumeweb/libresolver/dist/resolverModule.js";