diff --git a/packages/automation-witness-server/tsconfig.json b/packages/automation-witness-server/tsconfig.json
index 32d14e1fc20..ee61985eb0f 100644
--- a/packages/automation-witness-server/tsconfig.json
+++ b/packages/automation-witness-server/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/automation-witness-server/tsconfig.typedoc.json b/packages/automation-witness-server/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/automation-witness-server/tsconfig.typedoc.json
+++ b/packages/automation-witness-server/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 32d14e1fc20..ee61985eb0f 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/cli/tsconfig.typedoc.json b/packages/cli/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/cli/tsconfig.typedoc.json
+++ b/packages/cli/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/manifest/packages/model/tsconfig.json b/packages/manifest/packages/model/tsconfig.json
index c42d01c071b..3e86a18183e 100644
--- a/packages/manifest/packages/model/tsconfig.json
+++ b/packages/manifest/packages/model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/manifest/packages/model/tsconfig.typedoc.json b/packages/manifest/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/manifest/packages/model/tsconfig.typedoc.json
+++ b/packages/manifest/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/manifest/tsconfig.json b/packages/manifest/tsconfig.json
index c42d01c071b..3e86a18183e 100644
--- a/packages/manifest/tsconfig.json
+++ b/packages/manifest/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/manifest/tsconfig.typedoc.json b/packages/manifest/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/manifest/tsconfig.typedoc.json
+++ b/packages/manifest/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/packages/abstract/src/AbstractArchivist.ts b/packages/modules/packages/archivist/packages/abstract/src/AbstractArchivist.ts
index 023d50411ea..9c12b24c506 100644
--- a/packages/modules/packages/archivist/packages/abstract/src/AbstractArchivist.ts
+++ b/packages/modules/packages/archivist/packages/abstract/src/AbstractArchivist.ts
@@ -1,5 +1,4 @@
 import { assertEx } from '@xylabs/assert'
-import { Account } from '@xyo-network/account'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -19,9 +18,8 @@ import {
 } from '@xyo-network/archivist-model'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { handleErrorAsync } from '@xyo-network/error'
-import { AbstractModuleInstance, duplicateModules, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
-import { ModuleError, Payload } from '@xyo-network/payload-model'
+import { AbstractModuleInstance, duplicateModules, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module'
+import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable, PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
@@ -86,7 +84,7 @@ export abstract class AbstractArchivist<
     })
   }
 
-  delete(hashes: string[]): PromisableArray<boolean> {
+  delete(hashes: string[]): PromisableArray<Payload> {
     return this.busy(async () => {
       await this.started('throw')
       return await this.deleteHandler(hashes)
@@ -119,7 +117,7 @@ export abstract class AbstractArchivist<
     throw Error('Not implemented')
   }
 
-  protected deleteHandler(_hashes: string[]): PromisableArray<boolean> {
+  protected deleteHandler(_hashes: string[]): PromisableArray<Payload> {
     throw Error('Not implemented')
   }
 
@@ -173,69 +171,52 @@ export abstract class AbstractArchivist<
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
+  ): Promise<ModuleQueryHandlerResult> {
     const wrappedQuery = QueryBoundWitnessWrapper.parseQuery<ArchivistQuery>(query, payloads)
     const queryPayload = await wrappedQuery.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
     const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    const queryAccount = this.ephemeralQueryAccountEnabled ? Account.randomSync() : undefined
     if (this.config.storeQueries) {
       await this.insertHandler([query])
     }
-    try {
-      switch (queryPayload.schema) {
-        case ArchivistAllQuerySchema:
-          resultPayloads.push(...(await this.allHandler()))
-          break
-        case ArchivistClearQuerySchema:
-          await this.clearHandler()
-          break
-        case ArchivistCommitQuerySchema:
-          resultPayloads.push(...(await this.commitHandler()))
-          break
-        case ArchivistDeleteQuerySchema:
-          await this.deleteHandler(wrappedQuery.payloadHashes)
-          break
-        case ArchivistGetQuerySchema:
-          if (queryPayload.hashes?.length) {
-            resultPayloads.push(...(await this.getHandler(queryPayload.hashes)))
-          } else {
-            const head = await this.head()
-            if (head) resultPayloads.push(head)
-          }
-          break
-        case ArchivistInsertQuerySchema: {
-          const payloads = await wrappedQuery.getPayloads()
-          assertEx(await wrappedQuery.getPayloads(), `Missing payloads: ${JSON.stringify(wrappedQuery.payload(), null, 2)}`)
-          const resolvedPayloads = await PayloadWrapper.filterExclude(payloads, await wrappedQuery.hashAsync())
-          assertEx(
-            resolvedPayloads.length === payloads.length,
-            `Could not find some passed hashes [${resolvedPayloads.length} != ${payloads.length}]`,
-          )
-          resultPayloads.push(...(await this.insertHandler(payloads)))
-          // NOTE: There isn't an exact equivalence between what we get and what we store. Once
-          // we move to returning only inserted Payloads(/hash) instead of a BoundWitness, we
-          // can grab the actual last one
-          this._lastInsertedPayload = resolvedPayloads[resolvedPayloads.length - 1]
-          break
+
+    switch (queryPayload.schema) {
+      case ArchivistAllQuerySchema:
+        resultPayloads.push(...(await this.allHandler()))
+        break
+      case ArchivistClearQuerySchema:
+        await this.clearHandler()
+        break
+      case ArchivistCommitQuerySchema:
+        resultPayloads.push(...(await this.commitHandler()))
+        break
+      case ArchivistDeleteQuerySchema:
+        resultPayloads.push(...(await this.deleteHandler(wrappedQuery.payloadHashes)))
+        break
+      case ArchivistGetQuerySchema:
+        if (queryPayload.hashes?.length) {
+          resultPayloads.push(...(await this.getHandler(queryPayload.hashes)))
+        } else {
+          const head = await this.head()
+          if (head) resultPayloads.push(head)
         }
-        default:
-          return super.queryHandler(query, payloads)
+        break
+      case ArchivistInsertQuerySchema: {
+        const payloads = await wrappedQuery.getPayloads()
+        assertEx(await wrappedQuery.getPayloads(), `Missing payloads: ${JSON.stringify(wrappedQuery.payload(), null, 2)}`)
+        const resolvedPayloads = await PayloadWrapper.filterExclude(payloads, await wrappedQuery.hashAsync())
+        assertEx(resolvedPayloads.length === payloads.length, `Could not find some passed hashes [${resolvedPayloads.length} != ${payloads.length}]`)
+        resultPayloads.push(...(await this.insertHandler(payloads)))
+        // NOTE: There isn't an exact equivalence between what we get and what we store. Once
+        // we move to returning only inserted Payloads(/hash) instead of a BoundWitness, we
+        // can grab the actual last one
+        this._lastInsertedPayload = resolvedPayloads[resolvedPayloads.length - 1]
+        break
       }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrappedQuery.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
+      default:
+        return await super.queryHandler(query, payloads)
     }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads))[0]
+    return resultPayloads
   }
 
   protected async writeToParent(parent: ArchivistInstance, payloads: Payload[]) {
diff --git a/packages/modules/packages/archivist/packages/abstract/tsconfig.json b/packages/modules/packages/archivist/packages/abstract/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/archivist/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/archivist/packages/abstract/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/archivist/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/packages/filesystem/src/FilesystemArchivist.ts b/packages/modules/packages/archivist/packages/filesystem/src/FilesystemArchivist.ts
index 2fbe3a4ce5a..0c52405ab92 100644
--- a/packages/modules/packages/archivist/packages/filesystem/src/FilesystemArchivist.ts
+++ b/packages/modules/packages/archivist/packages/filesystem/src/FilesystemArchivist.ts
@@ -81,7 +81,7 @@ export class FilesystemArchivist<TParams extends FilesystemArchivistParams = Fil
     return await this.memoryArchivist.commit()
   }
 
-  protected override deleteHandler(hashes: string[]): PromisableArray<boolean> {
+  protected override deleteHandler(hashes: string[]): PromisableArray<Payload> {
     return this.memoryArchivist.delete(hashes)
   }
 
diff --git a/packages/modules/packages/archivist/packages/filesystem/tsconfig.json b/packages/modules/packages/archivist/packages/filesystem/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/archivist/packages/filesystem/tsconfig.json
+++ b/packages/modules/packages/archivist/packages/filesystem/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/packages/filesystem/tsconfig.typedoc.json b/packages/modules/packages/archivist/packages/filesystem/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/packages/filesystem/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/packages/filesystem/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/packages/indexeddb/src/IndexedDbArchivist.ts b/packages/modules/packages/archivist/packages/indexeddb/src/IndexedDbArchivist.ts
index 9df2b340f61..cf6f359f52c 100644
--- a/packages/modules/packages/archivist/packages/indexeddb/src/IndexedDbArchivist.ts
+++ b/packages/modules/packages/archivist/packages/indexeddb/src/IndexedDbArchivist.ts
@@ -9,11 +9,11 @@ import {
   ArchivistModuleEventData,
   ArchivistParams,
 } from '@xyo-network/archivist-model'
-import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadHasher } from '@xyo-network/core'
 import { AnyConfigSchema, creatableModule } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { clear, createStore, delMany, entries, getMany, setMany, UseStore } from 'idb-keyval'
+import compact from 'lodash/compact'
 
 export type IndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config'
 export const IndexedDbArchivistConfigSchema: IndexedDbArchivistConfigSchema = 'network.xyo.archivist.indexeddb.config'
@@ -84,9 +84,17 @@ export class IndexedDbArchivist<
     await clear(this.db)
   }
 
-  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
-    await delMany(hashes, this.db)
-    return hashes.map((_) => true)
+  protected override async deleteHandler(hashes: string[]): Promise<Payload[]> {
+    const payloadPairs: [string, Payload][] = await Promise.all(
+      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),
+    )
+
+    const foundHashesToDelete = payloadPairs.map(([hash, _]) => hash)
+    await delMany(foundHashesToDelete, this.db)
+
+    await this.emit('deleted', { hashes: foundHashesToDelete, module: this })
+    const result = payloadPairs.map(([_, payload]) => payload)
+    return result
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
@@ -94,7 +102,7 @@ export class IndexedDbArchivist<
     return result
   }
 
-  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<Payload[]> {
     const entries = await Promise.all(
       payloads.map<Promise<[string, Payload]>>(async (payload) => {
         const hash = await PayloadHasher.hashAsync(payload)
@@ -102,8 +110,7 @@ export class IndexedDbArchivist<
       }),
     )
     await setMany(entries, this.db)
-    const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, payloads)
-    return [result[0]]
+    return payloads
   }
 
   protected override async startHandler() {
diff --git a/packages/modules/packages/archivist/packages/indexeddb/tsconfig.json b/packages/modules/packages/archivist/packages/indexeddb/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/archivist/packages/indexeddb/tsconfig.json
+++ b/packages/modules/packages/archivist/packages/indexeddb/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/packages/indexeddb/tsconfig.typedoc.json b/packages/modules/packages/archivist/packages/indexeddb/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/packages/indexeddb/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/packages/indexeddb/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/packages/memory/src/MemoryArchivist.ts b/packages/modules/packages/archivist/packages/memory/src/MemoryArchivist.ts
index 97e62b011b3..bfc87a16ea0 100644
--- a/packages/modules/packages/archivist/packages/memory/src/MemoryArchivist.ts
+++ b/packages/modules/packages/archivist/packages/memory/src/MemoryArchivist.ts
@@ -14,6 +14,7 @@ import {
   ArchivistModuleEventData,
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
+import { PayloadHasher } from '@xyo-network/core'
 import { AnyConfigSchema, creatableModule, ModuleInstance, ModuleParams } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -78,7 +79,6 @@ export class MemoryArchivist<
       compact(
         Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
           const queryPayload: ArchivistInsertQuery = {
-            payloads: await Promise.all(payloads.map((payload) => PayloadWrapper.hashAsync(payload))),
             schema: ArchivistInsertQuerySchema,
           }
           const query = await this.bindQuery(queryPayload, payloads)
@@ -90,12 +90,20 @@ export class MemoryArchivist<
     return compact(settled.filter(fulfilled).map((result) => result.value))
   }
 
-  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
-    const found = hashes.map((hash) => {
-      return this.cache.delete(hash)
-    })
-    await this.emit('deleted', { found, hashes, module: this })
-    return found
+  protected override async deleteHandler(hashes: string[]): Promise<Payload[]> {
+    const payloadPairs: [string, Payload][] = await Promise.all(
+      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),
+    )
+    const deletedPairs: [string, Payload][] = compact(
+      await Promise.all(
+        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {
+          return this.cache.delete(hash) ? [hash, payload] : undefined
+        }),
+      ),
+    )
+    await this.emit('deleted', { hashes: deletedPairs.map(([hash, _]) => hash), module: this })
+    const result = deletedPairs.map(([_, payload]) => payload)
+    return result
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
@@ -122,12 +130,7 @@ export class MemoryArchivist<
       }),
     )
 
-    const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, payloads)
-    const parents = await this.parents()
-    if (Object.entries(parents.write ?? {}).length) {
-      // We store the child bw also
-      await this.writeToParents([result[0], ...payloads])
-    }
+    await this.writeToParents(payloads)
     await this.emit('inserted', { module: this, payloads })
     return payloads
   }
diff --git a/packages/modules/packages/archivist/packages/memory/tsconfig.json b/packages/modules/packages/archivist/packages/memory/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/archivist/packages/memory/tsconfig.json
+++ b/packages/modules/packages/archivist/packages/memory/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/archivist/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/packages/model/src/Archivist.ts b/packages/modules/packages/archivist/packages/model/src/Archivist.ts
index 1d993ac1162..524959a5c71 100644
--- a/packages/modules/packages/archivist/packages/model/src/Archivist.ts
+++ b/packages/modules/packages/archivist/packages/model/src/Archivist.ts
@@ -13,12 +13,12 @@ export interface ReadArchivist<TReadResponse, TId = string> {
 
 export interface WriteArchivist<TReadResponse, TWriteResponse = TReadResponse, TWrite = TReadResponse, TId = string> {
   clear?(): Promisable<void>
-  delete?(ids: TId[]): PromisableArray<boolean>
+  delete?(ids: TId[]): PromisableArray<TWriteResponse>
   insert(item: TWrite[]): PromisableArray<TWriteResponse>
 }
 
 export interface StashArchivist<TWriteResponse> {
-  commit?(): Promisable<TWriteResponse[]>
+  commit?(): PromisableArray<TWriteResponse>
 }
 
 export type ArchivistParams<
diff --git a/packages/modules/packages/archivist/packages/model/src/Events/Deleted.ts b/packages/modules/packages/archivist/packages/model/src/Events/Deleted.ts
index 94d9e791c95..8fa4d78e252 100644
--- a/packages/modules/packages/archivist/packages/model/src/Events/Deleted.ts
+++ b/packages/modules/packages/archivist/packages/model/src/Events/Deleted.ts
@@ -4,7 +4,6 @@ import { Module, ModuleEventArgs } from '@xyo-network/module-model'
 export type DeletedEventArgs<T extends Module = Module> = ModuleEventArgs<
   T,
   {
-    found: boolean[]
     hashes: string[]
   }
 >
diff --git a/packages/modules/packages/archivist/packages/model/src/Queries/Insert.ts b/packages/modules/packages/archivist/packages/model/src/Queries/Insert.ts
index b2668dc8b99..b1a5659b169 100644
--- a/packages/modules/packages/archivist/packages/model/src/Queries/Insert.ts
+++ b/packages/modules/packages/archivist/packages/model/src/Queries/Insert.ts
@@ -4,6 +4,5 @@ export type ArchivistInsertQuerySchema = 'network.xyo.query.archivist.insert'
 export const ArchivistInsertQuerySchema: ArchivistInsertQuerySchema = 'network.xyo.query.archivist.insert'
 
 export type ArchivistInsertQuery = Query<{
-  payloads: string[]
   schema: ArchivistInsertQuerySchema
 }>
diff --git a/packages/modules/packages/archivist/packages/model/tsconfig.json b/packages/modules/packages/archivist/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/archivist/packages/model/tsconfig.json
+++ b/packages/modules/packages/archivist/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/packages/model/tsconfig.typedoc.json b/packages/modules/packages/archivist/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/packages/wrapper/src/ArchivistWrapper.ts b/packages/modules/packages/archivist/packages/wrapper/src/ArchivistWrapper.ts
index 3336c126873..e7863533fc9 100644
--- a/packages/modules/packages/archivist/packages/wrapper/src/ArchivistWrapper.ts
+++ b/packages/modules/packages/archivist/packages/wrapper/src/ArchivistWrapper.ts
@@ -16,11 +16,9 @@ import {
   isArchivistInstance,
   isArchivistModule,
 } from '@xyo-network/archivist-model'
-import { BoundWitness, BoundWitnessSchema, isBoundWitnessPayload } from '@xyo-network/boundwitness-model'
 import { PayloadHasher } from '@xyo-network/core'
 import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module-wrapper'
 import { Payload } from '@xyo-network/payload-model'
-import compact from 'lodash/compact'
 
 constructableModuleWrapper()
 export class ArchivistWrapper<TWrappedModule extends ArchivistModule = ArchivistModule>
@@ -33,8 +31,7 @@ export class ArchivistWrapper<TWrappedModule extends ArchivistModule = Archivist
 
   async all(): Promise<Payload[]> {
     const queryPayload: ArchivistAllQuery = { schema: ArchivistAllQuerySchema }
-    const result = await this.sendQuery(queryPayload)
-    return compact(result)
+    return await this.sendQuery(queryPayload)
   }
 
   async clear(): Promise<void> {
@@ -42,35 +39,25 @@ export class ArchivistWrapper<TWrappedModule extends ArchivistModule = Archivist
     await this.sendQuery(queryPayload)
   }
 
-  async commit(): Promise<BoundWitness[]> {
+  async commit(): Promise<Payload[]> {
     const queryPayload: ArchivistCommitQuery = { schema: ArchivistCommitQuerySchema }
-    const result = await this.sendQuery(queryPayload)
-    return result.filter(isBoundWitnessPayload)
+    return await this.sendQuery(queryPayload)
   }
 
   async delete(hashes: string[]) {
     const queryPayload: ArchivistDeleteQuery = { hashes, schema: ArchivistDeleteQuerySchema }
-    const query = await this.bindQuery(queryPayload)
-    const result = await this.module.query(query[0], query[1])
-    await this.throwErrors(query, result)
-    return result[0].payload_hashes.map(() => true)
+    return await this.sendQuery(queryPayload)
   }
 
   async get(hashes: string[]): Promise<Payload[]> {
     const queryPayload: ArchivistGetQuery = { hashes, schema: ArchivistGetQuerySchema }
-    const result = await this.sendQuery(queryPayload)
-    return result
+    return await this.sendQuery(queryPayload)
   }
 
-  async insert(payloads: Payload[]): Promise<BoundWitness[]> {
+  async insert(payloads: Payload[]): Promise<Payload[]> {
     const queryPayload: ArchivistInsertQuery = {
-      payloads: await PayloadHasher.hashes(payloads),
       schema: ArchivistInsertQuerySchema,
     }
-    const query = await this.bindQuery(queryPayload, payloads)
-    const result = await this.module.query(query[0], [queryPayload, ...payloads])
-    const innerBoundWitnesses = result[1]?.filter<BoundWitness>((payload): payload is BoundWitness => payload?.schema === BoundWitnessSchema) ?? []
-    await this.throwErrors(query, result)
-    return [result[0], ...innerBoundWitnesses]
+    return await this.sendQuery(queryPayload, payloads)
   }
 }
diff --git a/packages/modules/packages/archivist/packages/wrapper/tsconfig.json b/packages/modules/packages/archivist/packages/wrapper/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/archivist/packages/wrapper/tsconfig.json
+++ b/packages/modules/packages/archivist/packages/wrapper/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/packages/wrapper/tsconfig.typedoc.json b/packages/modules/packages/archivist/packages/wrapper/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/archivist/src/AbstractArchivingModule.ts b/packages/modules/packages/archivist/src/AbstractArchivingModule.ts
index a29e72776e8..071d91e7c9a 100644
--- a/packages/modules/packages/archivist/src/AbstractArchivingModule.ts
+++ b/packages/modules/packages/archivist/src/AbstractArchivingModule.ts
@@ -24,10 +24,10 @@ export abstract class AbstractArchivingModule<
     payloads: Payload[],
     additionalWitnesses: AccountInstance[] = [],
     errorPayloads: ModuleError[] = [],
-  ): Promise<[ModuleQueryResult, AccountInstance[]]> {
-    const [result, witnesses] = await super.bindQueryResult(query, payloads, additionalWitnesses, errorPayloads)
-    await this.storeToArchivists([result[0], ...result[1]])
-    return [result, witnesses]
+  ): Promise<ModuleQueryResult> {
+    const result = await super.bindQueryResult(query, payloads, additionalWitnesses, errorPayloads)
+    await this.storeToArchivists(result.flat())
+    return result
   }
 
   protected async resolveArchivists(): Promise<ArchivistInstance[]> {
diff --git a/packages/modules/packages/archivist/src/CookieArchivist.ts b/packages/modules/packages/archivist/src/CookieArchivist.ts
index 285e2e0a2db..25687afa3fe 100644
--- a/packages/modules/packages/archivist/src/CookieArchivist.ts
+++ b/packages/modules/packages/archivist/src/CookieArchivist.ts
@@ -101,7 +101,6 @@ export class CookieArchivist<
         compact(
           Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
             const queryPayload: ArchivistInsertQuery = {
-              payloads: await PayloadHasher.hashes(payloads),
               schema: ArchivistInsertQuerySchema,
             }
             const query = await this.bindQuery(queryPayload, payloads)
@@ -117,18 +116,21 @@ export class CookieArchivist<
     }
   }
 
-  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
-    try {
-      const found = hashes.map((hash) => {
-        Cookies.remove(this.keyFromHash(hash))
-        return true
-      })
-      await this.emit('deleted', { found, hashes, module: this })
-      return found
-    } catch (ex) {
-      console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw ex
-    }
+  protected override async deleteHandler(hashes: string[]): Promise<Payload[]> {
+    const payloadPairs: [string, Payload][] = await Promise.all(
+      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),
+    )
+    const deletedPairs: [string, Payload][] = compact(
+      await Promise.all(
+        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {
+          Cookies.remove(hash)
+          return [hash, payload]
+        }),
+      ),
+    )
+    await this.emit('deleted', { hashes: deletedPairs.map(([hash, _]) => hash), module: this })
+    const result = deletedPairs.map(([_, payload]) => payload)
+    return result
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
@@ -157,12 +159,7 @@ export class CookieArchivist<
           return wrapper.payload()
         }),
       )
-      const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads)
-      const parents = await this.parents()
-      if (Object.entries(parents.write ?? {}).length) {
-        //we store the child bw also
-        await this.writeToParents([result[0], ...resultPayloads])
-      }
+      await this.writeToParents(resultPayloads)
       await this.emit('inserted', { module: this, payloads })
       return payloads
     } catch (ex) {
diff --git a/packages/modules/packages/archivist/src/StorageArchivist.ts b/packages/modules/packages/archivist/src/StorageArchivist.ts
index 75e4bae0a71..a30b3046932 100644
--- a/packages/modules/packages/archivist/src/StorageArchivist.ts
+++ b/packages/modules/packages/archivist/src/StorageArchivist.ts
@@ -127,7 +127,6 @@ export class StorageArchivist<
       compact(
         Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
           const queryPayload: ArchivistInsertQuery = {
-            payloads: await PayloadHasher.hashes(payloads),
             schema: ArchivistInsertQuerySchema,
           }
           const query = await this.bindQuery(queryPayload, payloads)
@@ -140,14 +139,21 @@ export class StorageArchivist<
     return compact(settled.filter(fulfilled).map((result) => result.value))
   }
 
-  protected override async deleteHandler(hashes: string[]): Promise<boolean[]> {
-    this.logger?.log(`delete: hashes.length: ${hashes.length}`)
-    const found = hashes.map((hash) => {
-      this.storage.remove(hash)
-      return true
-    })
-    await this.emit('deleted', { found, hashes, module: this })
-    return found
+  protected override async deleteHandler(hashes: string[]): Promise<Payload[]> {
+    const payloadPairs: [string, Payload][] = await Promise.all(
+      (await this.get(hashes)).map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),
+    )
+    const deletedPairs: [string, Payload][] = compact(
+      await Promise.all(
+        payloadPairs.map<[string, Payload] | undefined>(([hash, payload]) => {
+          this.storage.remove(hash)
+          return [hash, payload]
+        }),
+      ),
+    )
+    await this.emit('deleted', { hashes: deletedPairs.map(([hash, _]) => hash), module: this })
+    const result = deletedPairs.map(([_, payload]) => payload)
+    return result
   }
 
   protected override async getHandler(hashes: string[]): Promise<Payload[]> {
@@ -175,12 +181,7 @@ export class StorageArchivist<
         return wrapper.payload()
       }),
     )
-    const [[storageBoundWitness]] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads)
-    const parents = await this.parents()
-    if (Object.entries(parents.write ?? {}).length) {
-      //we store the child bw also
-      await this.writeToParents([storageBoundWitness, ...resultPayloads])
-    }
+    await this.writeToParents(resultPayloads)
     await this.emit('inserted', { module: this, payloads })
     return payloads
   }
diff --git a/packages/modules/packages/archivist/tsconfig.json b/packages/modules/packages/archivist/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/archivist/tsconfig.json
+++ b/packages/modules/packages/archivist/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/archivist/tsconfig.typedoc.json b/packages/modules/packages/archivist/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/archivist/tsconfig.typedoc.json
+++ b/packages/modules/packages/archivist/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/bridge/packages/abstract/src/AbstractBridge.ts b/packages/modules/packages/bridge/packages/abstract/src/AbstractBridge.ts
index 9c361970c6d..70a0924506d 100644
--- a/packages/modules/packages/bridge/packages/abstract/src/AbstractBridge.ts
+++ b/packages/modules/packages/bridge/packages/abstract/src/AbstractBridge.ts
@@ -1,4 +1,3 @@
-import { Account } from '@xyo-network/account'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import {
   BridgeConfigSchema,
@@ -10,18 +9,9 @@ import {
   BridgeQueryBase,
 } from '@xyo-network/bridge-model'
 import { BridgeModuleResolver } from '@xyo-network/bridge-module-resolver'
-import { handleErrorAsync } from '@xyo-network/error'
-import {
-  AbstractModuleInstance,
-  duplicateModules,
-  ModuleConfig,
-  ModuleErrorBuilder,
-  ModuleEventData,
-  ModuleFilter,
-  ModuleQueryResult,
-} from '@xyo-network/module'
-import { ModuleFilterOptions, ModuleInstance } from '@xyo-network/module-model'
-import { ModuleError, Payload, Query } from '@xyo-network/payload-model'
+import { AbstractModuleInstance, duplicateModules, ModuleConfig, ModuleEventData, ModuleFilter, ModuleQueryResult } from '@xyo-network/module'
+import { ModuleFilterOptions, ModuleInstance, ModuleQueryHandlerResult } from '@xyo-network/module-model'
+import { Payload, Query } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 export abstract class AbstractBridge<TParams extends BridgeParams = BridgeParams, TEventData extends ModuleEventData = ModuleEventData>
@@ -82,38 +72,27 @@ export abstract class AbstractBridge<TParams extends BridgeParams = BridgeParams
     }
   }
 
-  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness>(query: T, payloads?: Payload[]): Promise<ModuleQueryResult> {
+  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness>(
+    query: T,
+    payloads?: Payload[],
+  ): Promise<ModuleQueryHandlerResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<BridgeQuery>(query, payloads)
     const queryPayload = await wrapper.getQuery()
-    const queryAccount = Account.randomSync()
     const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    try {
-      switch (queryPayload.schema) {
-        case BridgeConnectQuerySchema: {
-          await this.connect()
-          break
-        }
-        case BridgeDisconnectQuerySchema: {
-          await this.disconnect()
-          break
-        }
-        default:
-          return await super.queryHandler(query, payloads)
+
+    switch (queryPayload.schema) {
+      case BridgeConnectQuerySchema: {
+        await this.connect()
+        break
       }
-    } catch (error) {
-      await handleErrorAsync(error, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
+      case BridgeDisconnectQuerySchema: {
+        await this.disconnect()
+        break
+      }
+      default:
+        return await super.queryHandler(query, payloads)
     }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
+    return resultPayloads
   }
 
   abstract connect(): Promisable<boolean>
diff --git a/packages/modules/packages/bridge/packages/abstract/tsconfig.json b/packages/modules/packages/bridge/packages/abstract/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/bridge/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/bridge/packages/abstract/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/bridge/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/bridge/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/bridge/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/bridge/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/bridge/packages/http/tsconfig.json b/packages/modules/packages/bridge/packages/http/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/bridge/packages/http/tsconfig.json
+++ b/packages/modules/packages/bridge/packages/http/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/bridge/packages/http/tsconfig.typedoc.json b/packages/modules/packages/bridge/packages/http/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/bridge/packages/http/tsconfig.typedoc.json
+++ b/packages/modules/packages/bridge/packages/http/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/bridge/packages/model/tsconfig.json b/packages/modules/packages/bridge/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/bridge/packages/model/tsconfig.json
+++ b/packages/modules/packages/bridge/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/bridge/packages/model/tsconfig.typedoc.json b/packages/modules/packages/bridge/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/bridge/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/bridge/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/bridge/packages/module-resolver/tsconfig.json b/packages/modules/packages/bridge/packages/module-resolver/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/bridge/packages/module-resolver/tsconfig.json
+++ b/packages/modules/packages/bridge/packages/module-resolver/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/bridge/packages/module-resolver/tsconfig.typedoc.json b/packages/modules/packages/bridge/packages/module-resolver/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/bridge/packages/module-resolver/tsconfig.typedoc.json
+++ b/packages/modules/packages/bridge/packages/module-resolver/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/bridge/packages/worker/tsconfig.json b/packages/modules/packages/bridge/packages/worker/tsconfig.json
index 269fc253c22..68a13da8652 100644
--- a/packages/modules/packages/bridge/packages/worker/tsconfig.json
+++ b/packages/modules/packages/bridge/packages/worker/tsconfig.json
@@ -7,6 +7,6 @@
     "lib": ["WebWorker"],
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/bridge/packages/wrapper/src/BridgeWrapper.ts b/packages/modules/packages/bridge/packages/wrapper/src/BridgeWrapper.ts
index 2acfc796292..1faf5220557 100644
--- a/packages/modules/packages/bridge/packages/wrapper/src/BridgeWrapper.ts
+++ b/packages/modules/packages/bridge/packages/wrapper/src/BridgeWrapper.ts
@@ -83,8 +83,11 @@ export class BridgeWrapper<TWrappedModule extends BridgeModule = BridgeModule>
 
   protected async sendTargetQuery<T extends Query>(address: string, queryPayload: T, payloads?: Payload[]): Promise<Payload[]> {
     const query = await this.bindQuery(queryPayload, payloads)
-    const result = await this.module.targetQuery(address, query[0], query[1])
-    await this.throwErrors(query, result)
-    return result[1]
+    const [, resultPayloads, errors] = await this.module.targetQuery(address, query[0], query[1])
+    //TODO: figure out a rollup error solution
+    if (errors?.length > 0) {
+      throw errors[0]
+    }
+    return resultPayloads
   }
 }
diff --git a/packages/modules/packages/bridge/packages/wrapper/tsconfig.json b/packages/modules/packages/bridge/packages/wrapper/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/bridge/packages/wrapper/tsconfig.json
+++ b/packages/modules/packages/bridge/packages/wrapper/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/bridge/packages/wrapper/tsconfig.typedoc.json b/packages/modules/packages/bridge/packages/wrapper/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/bridge/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/modules/packages/bridge/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/bridge/tsconfig.json b/packages/modules/packages/bridge/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/bridge/tsconfig.json
+++ b/packages/modules/packages/bridge/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/abstract/src/AbstractDiviner.ts b/packages/modules/packages/diviner/packages/abstract/src/AbstractDiviner.ts
index e5f763520c6..e06bd0967a4 100644
--- a/packages/modules/packages/diviner/packages/abstract/src/AbstractDiviner.ts
+++ b/packages/modules/packages/diviner/packages/abstract/src/AbstractDiviner.ts
@@ -1,5 +1,4 @@
 import { assertEx } from '@xylabs/assert'
-import { HDWallet } from '@xyo-network/account'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { PayloadHasher } from '@xyo-network/core'
 import {
@@ -11,9 +10,8 @@ import {
   DivinerQuery,
   DivinerQueryBase,
 } from '@xyo-network/diviner-model'
-import { handleErrorAsync } from '@xyo-network/error'
-import { AbstractModuleInstance, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
-import { ModuleError, Payload } from '@xyo-network/payload-model'
+import { AbstractModuleInstance, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module'
+import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 export abstract class AbstractDiviner<
@@ -47,38 +45,23 @@ export abstract class AbstractDiviner<
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
+  ): Promise<ModuleQueryHandlerResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<DivinerQuery>(query, payloads)
     //remove the query payload
     const cleanPayloads = await PayloadHasher.filterExclude(payloads, query.query)
     const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
-    const queryAccount = this.ephemeralQueryAccountEnabled ? await HDWallet.random() : undefined
     const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    try {
-      switch (queryPayload.schema) {
-        case DivinerDivineQuerySchema:
-          await this.emit('reportStart', { inPayloads: payloads, module: this })
-          resultPayloads.push(...(await this.divineHandler(cleanPayloads)))
-          await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
-          break
-        default:
-          return super.queryHandler(query, payloads)
-      }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
+    switch (queryPayload.schema) {
+      case DivinerDivineQuerySchema:
+        await this.emit('reportStart', { inPayloads: payloads, module: this })
+        resultPayloads.push(...(await this.divineHandler(cleanPayloads)))
+        await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
+        break
+      default:
+        return super.queryHandler(query, payloads)
     }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads))[0]
+    return resultPayloads
   }
 
   protected abstract divineHandler(payloads?: Payload[]): Promisable<Payload[]>
diff --git a/packages/modules/packages/diviner/packages/abstract/tsconfig.json b/packages/modules/packages/diviner/packages/abstract/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/abstract/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addresschain/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addresschain/packages/abstract/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/modules/packages/diviner/packages/addresschain/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addresschain/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addresschain/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addresschain/packages/memory/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/modules/packages/diviner/packages/addresschain/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addresschain/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addresschain/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addresschain/packages/model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/modules/packages/diviner/packages/addresschain/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addresschain/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addresschain/tsconfig.json b/packages/modules/packages/diviner/packages/addresschain/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/addresschain/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/addresschain/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/addresschain/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addresschain/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addresschain/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addresschain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addresshistory/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addresshistory/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addresshistory/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addresshistory/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addresshistory/tsconfig.json b/packages/modules/packages/diviner/packages/addresshistory/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/addresshistory/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/addresshistory/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/addresshistory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addresshistory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addresshistory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addresshistory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addressspace/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addressspace/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addressspace/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addressspace/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addressspace/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addressspace/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addressspace/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addressspace/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addressspace/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addressspace/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addressspace/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addressspace/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/addressspace/tsconfig.json b/packages/modules/packages/diviner/packages/addressspace/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/addressspace/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/addressspace/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/addressspace/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/addressspace/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/addressspace/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/addressspace/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitness/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitness/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitness/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitness/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitness/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitness/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitness/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitness/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitness/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitness/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitness/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitness/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitness/tsconfig.json b/packages/modules/packages/diviner/packages/boundwitness/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/boundwitness/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/boundwitness/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/boundwitness/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitness/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitness/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitness/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitnessstats/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitnessstats/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitnessstats/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitnessstats/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitnessstats/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitnessstats/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitnessstats/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitnessstats/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitnessstats/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitnessstats/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitnessstats/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitnessstats/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.json b/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/boundwitnessstats/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/coin/packages/userlocations/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/coin/packages/userlocations/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/coin/packages/userlocations/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/coin/packages/userlocations/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/coin/packages/userlocations/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/coin/tsconfig.json b/packages/modules/packages/diviner/packages/coin/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/coin/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/coin/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/coin/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/coin/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/coin/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/coin/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.json b/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/forecasting/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.json b/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/forecasting/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.json b/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/forecasting/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/forecasting/tsconfig.json b/packages/modules/packages/diviner/packages/forecasting/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/forecasting/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/forecasting/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/forecasting/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/forecasting/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/modules/packages/diviner/packages/forecasting/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/forecasting/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/model/tsconfig.json b/packages/modules/packages/diviner/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/model/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/models/tsconfig.json b/packages/modules/packages/diviner/packages/models/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/models/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/models/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/models/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/models/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/models/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/models/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payload/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payload/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payload/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payload/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payload/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payload/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payload/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payload/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payload/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payload/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payload/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payload/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payload/tsconfig.json b/packages/modules/packages/diviner/packages/payload/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/payload/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/payload/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/payload/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payload/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payload/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payload/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payloadstats/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payloadstats/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payloadstats/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payloadstats/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payloadstats/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payloadstats/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payloadstats/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payloadstats/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payloadstats/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payloadstats/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payloadstats/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payloadstats/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/payloadstats/tsconfig.json b/packages/modules/packages/diviner/packages/payloadstats/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/payloadstats/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/payloadstats/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/payloadstats/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/payloadstats/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/payloadstats/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/payloadstats/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.json b/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemalist/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.json b/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemalist/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.json b/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemalist/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemalist/tsconfig.json b/packages/modules/packages/diviner/packages/schemalist/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemalist/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemalist/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemalist/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemalist/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemalist/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemalist/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.json b/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemastats/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.json b/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemastats/packages/memory/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/schemastats/packages/model/tsconfig.json b/packages/modules/packages/diviner/packages/schemastats/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemastats/packages/model/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemastats/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemastats/tsconfig.json b/packages/modules/packages/diviner/packages/schemastats/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/schemastats/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/schemastats/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/schemastats/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/schemastats/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/schemastats/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/schemastats/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/packages/wrapper/tsconfig.json b/packages/modules/packages/diviner/packages/wrapper/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/diviner/packages/wrapper/tsconfig.json
+++ b/packages/modules/packages/diviner/packages/wrapper/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/packages/wrapper/tsconfig.typedoc.json b/packages/modules/packages/diviner/packages/wrapper/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/diviner/tsconfig.json b/packages/modules/packages/diviner/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/diviner/tsconfig.json
+++ b/packages/modules/packages/diviner/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/diviner/tsconfig.typedoc.json b/packages/modules/packages/diviner/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/diviner/tsconfig.typedoc.json
+++ b/packages/modules/packages/diviner/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/module/packages/abstract/src/AbstractModule.ts b/packages/modules/packages/module/packages/abstract/src/AbstractModule.ts
index ccc2f189e25..fabc05253ec 100644
--- a/packages/modules/packages/module/packages/abstract/src/AbstractModule.ts
+++ b/packages/modules/packages/module/packages/abstract/src/AbstractModule.ts
@@ -1,13 +1,14 @@
 /* eslint-disable max-lines */
 import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
-import { Account, HDWallet } from '@xyo-network/account'
+import { HDWallet } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
 import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
 import { BoundWitnessBuilder, QueryBoundWitness, QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { ConfigPayload, ConfigSchema } from '@xyo-network/config-payload-plugin'
+import { PayloadHasher } from '@xyo-network/core'
 import { handleError, handleErrorAsync } from '@xyo-network/error'
 import { ModuleManifestPayload, ModuleManifestPayloadSchema } from '@xyo-network/manifest-model'
 import {
@@ -36,6 +37,7 @@ import {
   ModuleQueriedEventArgs,
   ModuleQuery,
   ModuleQueryBase,
+  ModuleQueryHandlerResult,
   ModuleQueryResult,
   ModuleResolver,
   ModuleSubscribeQuerySchema,
@@ -238,12 +240,32 @@ export abstract class AbstractModule<
     queryConfig?: TConfig,
   ): Promise<ModuleQueryResult> {
     return await this.busy(async () => {
-      await this.started('throw')
-      const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig)
-
+      const resultPayloads: Payload[] = []
+      const errorPayloads: ModuleError[] = []
+      const queryAccount = this.ephemeralQueryAccountEnabled ? await HDWallet.random() : undefined
+      try {
+        await this.started('throw')
+        if (!this.allowAnonymous) {
+          if (query.addresses.length === 0) {
+            throw Error(`Anonymous Queries not allowed, but running anyway [${this.config.name}], [${this.address}]`)
+          }
+        }
+        resultPayloads.push(...(await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig)))
+      } catch (ex) {
+        await handleErrorAsync(ex, async (error) => {
+          errorPayloads.push(
+            new ModuleErrorBuilder()
+              .sources([await PayloadHasher.hashAsync(query)])
+              .name(this.config.name ?? '<Unknown>')
+              .query(query.schema)
+              .message(error.message)
+              .build(),
+          )
+        })
+      }
+      const result = await this.bindQueryResult(query, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads)
       const args: ModuleQueriedEventArgs = { module: this, payloads, query, result }
       await this.emit('moduleQueried', args)
-
       return result
     })
   }
@@ -392,13 +414,13 @@ export abstract class AbstractModule<
     payloads: Payload[],
     additionalWitnesses: AccountInstance[] = [],
     errors?: ModuleError[],
-  ): Promise<[ModuleQueryResult, AccountInstance[]]> {
+  ): Promise<ModuleQueryResult> {
     const builder = new BoundWitnessBuilder().payloads(payloads).errors(errors)
     const queryWitnessAccount = this.queryAccounts[query.schema as ModuleQueryBase['schema']]
     const witnesses = [this.account, queryWitnessAccount, ...additionalWitnesses].filter(exists)
     builder.witnesses(witnesses)
     const result: ModuleQueryResult = [(await builder.build())[0], payloads, errors ?? []]
-    return [result, witnesses]
+    return result
   }
 
   protected commitArchivist = () => this.getArchivist('commit')
@@ -491,57 +513,37 @@ export abstract class AbstractModule<
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
+  ): Promise<ModuleQueryHandlerResult> {
     await this.started('throw')
     const wrapper = QueryBoundWitnessWrapper.parseQuery<ModuleQuery>(query, payloads)
-    if (!this.allowAnonymous) {
-      if (query.addresses.length === 0) {
-        console.warn(`Anonymous Queries not allowed, but running anyway [${this.config.name}], [${this.address}]`)
-      }
-    }
     const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
     const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    const queryAccount = this.ephemeralQueryAccountEnabled ? Account.randomSync() : undefined
-    try {
-      switch (queryPayload.schema) {
-        case ModuleManifestQuerySchema: {
-          resultPayloads.push(await this.manifestHandler())
-          break
-        }
-        case ModuleDiscoverQuerySchema: {
-          resultPayloads.push(...(await this.discoverHandler()))
-          break
-        }
-        case ModuleDescribeQuerySchema: {
-          resultPayloads.push(await this.describeHandler())
-          break
-        }
-        case ModuleAddressQuerySchema: {
-          resultPayloads.push(...(await this.moduleAddressHandler()))
-          break
-        }
-        case ModuleSubscribeQuerySchema: {
-          this.subscribeHandler(queryAccount)
-          break
-        }
-        default:
-          console.error(`Unsupported Query [${(queryPayload as Payload).schema}]`)
+    switch (queryPayload.schema) {
+      case ModuleManifestQuerySchema: {
+        resultPayloads.push(await this.manifestHandler())
+        break
       }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
+      case ModuleDiscoverQuerySchema: {
+        resultPayloads.push(...(await this.discoverHandler()))
+        break
+      }
+      case ModuleDescribeQuerySchema: {
+        resultPayloads.push(await this.describeHandler())
+        break
+      }
+      case ModuleAddressQuerySchema: {
+        resultPayloads.push(...(await this.moduleAddressHandler()))
+        break
+      }
+      case ModuleSubscribeQuerySchema: {
+        this.subscribeHandler()
+        break
+      }
+      default:
+        throw Error(`Unsupported Query [${(queryPayload as Payload).schema}]`)
     }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, queryAccount ? [queryAccount] : [], errorPayloads))[0]
+    return resultPayloads
   }
 
   protected readArchivist = () => this.getArchivist('read')
@@ -558,7 +560,7 @@ export abstract class AbstractModule<
     return true
   }
 
-  protected subscribeHandler(_queryAccount?: AccountInstance) {
+  protected subscribeHandler() {
     return
   }
 
diff --git a/packages/modules/packages/module/packages/abstract/tsconfig.json b/packages/modules/packages/module/packages/abstract/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/module/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/module/packages/abstract/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/module/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/module/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/module/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/module/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/module/packages/events/tsconfig.json b/packages/modules/packages/module/packages/events/tsconfig.json
index 4685125c22a..e3513265758 100644
--- a/packages/modules/packages/module/packages/events/tsconfig.json
+++ b/packages/modules/packages/module/packages/events/tsconfig.json
@@ -3,6 +3,6 @@
     "composite": true,
     "declarationDir": "./dist/types"
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/module/packages/events/tsconfig.typedoc.json b/packages/modules/packages/module/packages/events/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/module/packages/events/tsconfig.typedoc.json
+++ b/packages/modules/packages/module/packages/events/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/module/packages/model/src/Config.ts b/packages/modules/packages/module/packages/model/src/Config.ts
index 929cd743bf7..4f10988aed9 100644
--- a/packages/modules/packages/module/packages/model/src/Config.ts
+++ b/packages/modules/packages/module/packages/model/src/Config.ts
@@ -21,52 +21,34 @@ export type ArchivistModuleConfig = NameOrAddress | IndividualArchivistConfig
 export type ModuleConfigBase<TConfig extends Payload | undefined = undefined> = Payload<
   WithAdditional<
     {
-      /**
-       * The name/address of the Archivist to use for this module
-       */
+      /** @field The name/address of the Archivist to use for this module */
       readonly archivist?: ArchivistModuleConfig
 
-      /**
-       * Friendly name of module (not collision resistent). Can be used to resolve module
-       * when registered/attached to Node.
-       */
+      /** @field Friendly name of module (not collision resistent). Can be used to resolve module when registered/attached to Node. */
       readonly name?: string
 
-      /**
-       * paging settings for queries
-       */
+      /** @field paging settings for queries */
       readonly paging?: Record<string, { size?: number }>
 
-      /**
-       * The config schema for the module
-       */
+      /** @field The config schema for the module */
       readonly schema: TConfig extends Payload ? TConfig['schema'] : ModuleConfigSchema
 
-      /**
-       * The query schemas and allowed/disallowed addresses which are allowed to issue them
-       * against the module. If both allowed and disallowed is specified, then disallowed
-       * takes priority
-       */
+      /** @field The query schemas and allowed/disallowed addresses which are allowed to issue them against the module. If both allowed and disallowed is specified, then disallowed takes priority. */
       readonly security?: {
-        /**
-         * Will the module process queries that have unsigned BoundWitness in query tuples
-         */
+        /** @field Will the module process queries that have unsigned BoundWitness in query tuples */
         readonly allowAnonymous?: boolean
 
-        /**
-         * If schema in record, then only these address sets can access query
-         */
+        /** @field If schema in record, then only these address sets can access query */
         readonly allowed?: Record<SchemaString, (AddressString | CosigningAddressSet)[]>
 
-        /**
-         * If schema in record, then anyone except these addresses can access query
-         */
+        /** @field If schema in record, then anyone except these addresses can access query */
         readonly disallowed?: Record<SchemaString, AddressString[]>
       }
 
-      /**
-       * Store the queries made to the module in an archivist if possible
-       */
+      /** @field sign every  */
+      readonly sign?: boolean
+
+      /** @field Store the queries made to the module in an archivist if possible */
       readonly storeQueries?: boolean
     },
     Omit<TConfig, 'schema'>
diff --git a/packages/modules/packages/module/packages/model/src/ModuleQueryHandlerResult.ts b/packages/modules/packages/module/packages/model/src/ModuleQueryHandlerResult.ts
new file mode 100644
index 00000000000..7440bdd9001
--- /dev/null
+++ b/packages/modules/packages/module/packages/model/src/ModuleQueryHandlerResult.ts
@@ -0,0 +1,3 @@
+import { Payload } from '@xyo-network/payload-model'
+
+export type ModuleQueryHandlerResult = Payload[]
diff --git a/packages/modules/packages/module/packages/model/src/ModuleQueryResult.ts b/packages/modules/packages/module/packages/model/src/ModuleQueryResult.ts
index a0ba576f484..e2bf712fded 100644
--- a/packages/modules/packages/module/packages/model/src/ModuleQueryResult.ts
+++ b/packages/modules/packages/module/packages/model/src/ModuleQueryResult.ts
@@ -1,4 +1,4 @@
 import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { Payload } from '@xyo-network/payload-model'
+import { ModuleError, Payload } from '@xyo-network/payload-model'
 
-export type ModuleQueryResult<E extends Payload[] = Payload[]> = [BoundWitness, Payload[], E]
+export type ModuleQueryResult = [BoundWitness, Payload[], ModuleError[]]
diff --git a/packages/modules/packages/module/packages/model/src/index.ts b/packages/modules/packages/module/packages/model/src/index.ts
index 5cfc7a4b1b0..1b229f9206f 100644
--- a/packages/modules/packages/module/packages/model/src/index.ts
+++ b/packages/modules/packages/module/packages/model/src/index.ts
@@ -8,6 +8,7 @@ export * from './module'
 export * from './ModuleDescription'
 export * from './ModuleFactory'
 export * from './ModuleParams'
+export * from './ModuleQueryHandlerResult'
 export * from './ModuleQueryResult'
 export * from './Queries'
 export * from './withModule'
diff --git a/packages/modules/packages/module/packages/model/tsconfig.json b/packages/modules/packages/module/packages/model/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/module/packages/model/tsconfig.json
+++ b/packages/modules/packages/module/packages/model/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/module/packages/model/tsconfig.typedoc.json b/packages/modules/packages/module/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/module/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/module/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/module/packages/wrapper/src/ModuleWrapper.ts b/packages/modules/packages/module/packages/wrapper/src/ModuleWrapper.ts
index 36153fe08e5..b71893ee870 100644
--- a/packages/modules/packages/module/packages/wrapper/src/ModuleWrapper.ts
+++ b/packages/modules/packages/module/packages/wrapper/src/ModuleWrapper.ts
@@ -36,7 +36,6 @@ import { Logger } from '@xyo-network/shared'
 import compact from 'lodash/compact'
 
 import { ModuleWrapperParams } from './models'
-import { WrapperError } from './WrapperError'
 
 export type ConstructableModuleWrapper<TWrapper extends ModuleWrapper> = {
   defaultLogger?: Logger
@@ -346,32 +345,15 @@ export class ModuleWrapper<TWrappedModule extends Module = Module>
     const query = await this.bindQuery(queryPayload, payloads)
 
     // Send them off
-    const result = await this.module.query(query[0], query[1])
+    const [, resultPayloads, errors] = await this.module.query(query[0], query[1])
 
-    /* TODO: Needs investigation. Problem is:
-      a) the function does not work and
-      b) it could be valid to return a payload with an error schema in a archivist get query
-    */
-    await this.throwErrors(query, result)
-    return result[1]
-  }
+    /* TODO: Figure out what to do with the returning BW.  Should we store them in a queue in case the caller wants to see them? */
 
-  protected async throwErrors(query: [QueryBoundWitness, Payload[], ModuleError[]], result?: ModuleQueryResult) {
-    const logError = (error: ModuleError) => {
-      console.log(`ModuleWrapper Error:  ${error.message} \n ${JSON.stringify(error, null, 2)}`)
+    if (errors && errors.length > 0) {
+      /* TODO: Figure out how to rollup multiple Errors */
+      throw errors[0]
     }
 
-    const errors = result ? await this.filterErrors(result) : []
-    if (errors?.length > 0) {
-      errors.map((error) => logError(error))
-      const error: WrapperError = {
-        errors,
-        message: errors.reduce((message, error) => `${message}${message.length > 0 ? '|' : ''}${error?.message}`, ''),
-        name: 'Error',
-        query,
-        result,
-      }
-      throw error
-    }
+    return resultPayloads
   }
 }
diff --git a/packages/modules/packages/module/packages/wrapper/src/WrapperError.ts b/packages/modules/packages/module/packages/wrapper/src/WrapperError.ts
deleted file mode 100644
index 64200186688..00000000000
--- a/packages/modules/packages/module/packages/wrapper/src/WrapperError.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { QueryBoundWitness } from '@xyo-network/boundwitness-builder'
-import { ModuleQueryResult } from '@xyo-network/module-model'
-import { ModuleError, Payload } from '@xyo-network/payload-model'
-
-export interface WrapperError extends Error {
-  errors: (ModuleError | null)[]
-  query: [QueryBoundWitness, Payload[], ModuleError[]]
-  result: ModuleQueryResult | undefined
-}
diff --git a/packages/modules/packages/module/packages/wrapper/src/index.ts b/packages/modules/packages/module/packages/wrapper/src/index.ts
index 5e1f542597b..f0414a3dca9 100644
--- a/packages/modules/packages/module/packages/wrapper/src/index.ts
+++ b/packages/modules/packages/module/packages/wrapper/src/index.ts
@@ -1,3 +1,2 @@
 export * from './models'
 export * from './ModuleWrapper'
-export * from './WrapperError'
diff --git a/packages/modules/packages/module/packages/wrapper/tsconfig.json b/packages/modules/packages/module/packages/wrapper/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/module/packages/wrapper/tsconfig.json
+++ b/packages/modules/packages/module/packages/wrapper/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/module/packages/wrapper/tsconfig.typedoc.json b/packages/modules/packages/module/packages/wrapper/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/module/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/modules/packages/module/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/module/tsconfig.json b/packages/modules/packages/module/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/module/tsconfig.json
+++ b/packages/modules/packages/module/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/module/tsconfig.typedoc.json b/packages/modules/packages/module/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/module/tsconfig.typedoc.json
+++ b/packages/modules/packages/module/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/node/packages/model/tsconfig.json b/packages/modules/packages/node/packages/model/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/node/packages/model/tsconfig.json
+++ b/packages/modules/packages/node/packages/model/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/node/packages/model/tsconfig.typedoc.json b/packages/modules/packages/node/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/node/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/node/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/node/packages/wrapper/tsconfig.json b/packages/modules/packages/node/packages/wrapper/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/node/packages/wrapper/tsconfig.json
+++ b/packages/modules/packages/node/packages/wrapper/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/node/packages/wrapper/tsconfig.typedoc.json b/packages/modules/packages/node/packages/wrapper/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/node/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/modules/packages/node/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/node/src/AbstractNode.ts b/packages/modules/packages/node/src/AbstractNode.ts
index d61fdd3be47..405e492bd40 100644
--- a/packages/modules/packages/node/src/AbstractNode.ts
+++ b/packages/modules/packages/node/src/AbstractNode.ts
@@ -1,10 +1,8 @@
 import { assertEx } from '@xylabs/assert'
-import { Account } from '@xyo-network/account'
 import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
-import { handleErrorAsync } from '@xyo-network/error'
 import { NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'
-import { AbstractModuleInstance, CompositeModuleResolver, ModuleErrorBuilder } from '@xyo-network/module-abstract'
+import { AbstractModuleInstance, CompositeModuleResolver } from '@xyo-network/module-abstract'
 import {
   duplicateModules,
   Module,
@@ -12,7 +10,7 @@ import {
   ModuleFilter,
   ModuleFilterOptions,
   ModuleInstance,
-  ModuleQueryResult,
+  ModuleQueryHandlerResult,
 } from '@xyo-network/module-model'
 import {
   NodeAttachedQuerySchema,
@@ -27,7 +25,7 @@ import {
   NodeRegisteredQuerySchema,
 } from '@xyo-network/node-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { ModuleError, Payload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
@@ -159,63 +157,48 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
+  ): Promise<ModuleQueryHandlerResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)
     const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
-    const queryAccount = Account.randomSync()
     const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    try {
-      switch (queryPayload.schema) {
-        case NodeAttachQuerySchema: {
-          const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)
-          if (address) {
-            const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
-            resultPayloads.push(payload)
-          }
-          break
+    switch (queryPayload.schema) {
+      case NodeAttachQuerySchema: {
+        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)
+        if (address) {
+          const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
+          resultPayloads.push(payload)
         }
-        case NodeDetachQuerySchema: {
-          const address = await this.detach(queryPayload.nameOrAddress)
-          if (address) {
-            const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
-            resultPayloads.push(payload)
-          }
-          break
+        break
+      }
+      case NodeDetachQuerySchema: {
+        const address = await this.detach(queryPayload.nameOrAddress)
+        if (address) {
+          const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
+          resultPayloads.push(payload)
         }
-        case NodeAttachedQuerySchema: {
-          const addresses = await this.attached()
-          for (const address of addresses) {
-            const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
-            resultPayloads.push(payload)
-          }
-          break
+        break
+      }
+      case NodeAttachedQuerySchema: {
+        const addresses = await this.attached()
+        for (const address of addresses) {
+          const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
+          resultPayloads.push(payload)
         }
-        case NodeRegisteredQuerySchema: {
-          const addresses = await this.registered()
-          for (const address of addresses) {
-            const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
-            resultPayloads.push(payload)
-          }
-          break
+        break
+      }
+      case NodeRegisteredQuerySchema: {
+        const addresses = await this.registered()
+        for (const address of addresses) {
+          const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
+          resultPayloads.push(payload)
         }
-        default:
-          return await super.queryHandler(query, payloads)
+        break
       }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
+      default:
+        return await super.queryHandler(query, payloads)
     }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
+    return resultPayloads
   }
 
   private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>
diff --git a/packages/modules/packages/node/tsconfig.json b/packages/modules/packages/node/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/node/tsconfig.json
+++ b/packages/modules/packages/node/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/node/tsconfig.typedoc.json b/packages/modules/packages/node/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/node/tsconfig.typedoc.json
+++ b/packages/modules/packages/node/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/sentinel/src/AbstractSentinel.ts b/packages/modules/packages/sentinel/src/AbstractSentinel.ts
index 55027c39788..78d01220b28 100644
--- a/packages/modules/packages/sentinel/src/AbstractSentinel.ts
+++ b/packages/modules/packages/sentinel/src/AbstractSentinel.ts
@@ -1,10 +1,8 @@
 import { assertEx } from '@xylabs/assert'
-import { Account } from '@xyo-network/account'
 import { AbstractArchivingModule, ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { handleErrorAsync } from '@xyo-network/error'
-import { AnyConfigSchema, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
+import { AnyConfigSchema, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { isWitnessInstance, WitnessInstance } from '@xyo-network/witness'
 import uniq from 'lodash/uniq'
@@ -82,50 +80,33 @@ export abstract class AbstractSentinel<
     this._witnesses = undefined
   }
 
+  async report(inPayloads?: Payload[]): Promise<Payload[]> {
+    await this.emit('reportStart', { inPayloads, module: this })
+    const outPayloads = await this.reportHandler(inPayloads)
+    await this.emit('reportEnd', { inPayloads, module: this, outPayloads })
+    return outPayloads
+  }
+
   protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
+  ): Promise<ModuleQueryHandlerResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<SentinelQueryBase>(query, payloads)
     const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
-    const queryAccount = Account.randomSync()
     const resultPayloads: Payload[] = []
-    try {
-      switch (queryPayload.schema) {
-        case SentinelReportQuerySchema: {
-          await this.emit('reportStart', { inPayloads: payloads, module: this })
-          resultPayloads.push(...(await this.report(payloads)))
-          await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
-          break
-        }
-        default: {
-          return super.queryHandler(query, payloads)
-        }
+    switch (queryPayload.schema) {
+      case SentinelReportQuerySchema: {
+        resultPayloads.push(...(await this.report(payloads)))
+        break
+      }
+      default: {
+        return super.queryHandler(query, payloads)
       }
-    } catch (ex) {
-      return await handleErrorAsync(ex, async (error) => {
-        const result = (
-          await this.bindQueryResult(
-            queryPayload,
-            [],
-            [queryAccount],
-            [
-              new ModuleErrorBuilder()
-                .sources([await wrapper.hashAsync()])
-                .name(this.config.name ?? '<Unknown>')
-                .query(query.schema)
-                .message(error.message)
-                .build(),
-            ],
-          )
-        )[0]
-        return result
-      })
     }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount]))[0]
+    return resultPayloads
   }
 
-  abstract report(payloads?: Payload[]): Promise<Payload[]>
+  abstract reportHandler(payloads?: Payload[]): Promise<Payload[]>
 }
diff --git a/packages/modules/packages/sentinel/src/MemorySentinel.ts b/packages/modules/packages/sentinel/src/MemorySentinel.ts
index df7cf31627c..40c7026a198 100644
--- a/packages/modules/packages/sentinel/src/MemorySentinel.ts
+++ b/packages/modules/packages/sentinel/src/MemorySentinel.ts
@@ -1,15 +1,13 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled, rejected } from '@xylabs/promise'
-import { Account } from '@xyo-network/account'
-import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
-import { handleError, handleErrorAsync } from '@xyo-network/error'
-import { AnyConfigSchema, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
-import { ModuleError, Payload } from '@xyo-network/payload-model'
+import { handleError } from '@xyo-network/error'
+import { AnyConfigSchema } from '@xyo-network/module'
+import { Payload } from '@xyo-network/payload-model'
 import { WitnessInstance } from '@xyo-network/witness'
 
 import { AbstractSentinel } from './AbstractSentinel'
 import { SentinelConfig, SentinelConfigSchema } from './Config'
-import { SentinelQuery, SentinelReportQuerySchema } from './Queries'
+import { SentinelReportQuerySchema } from './Queries'
 import { SentinelModule, SentinelModuleEventData, SentinelParams } from './SentinelModel'
 
 export type MemorySentinelParams<TConfig extends AnyConfigSchema<SentinelConfig> = AnyConfigSchema<SentinelConfig>> = SentinelParams<
@@ -25,7 +23,7 @@ export class MemorySentinel<
 {
   static override configSchemas = [SentinelConfigSchema]
 
-  async report(payloads: Payload[] = []): Promise<Payload[]> {
+  async reportHandler(payloads: Payload[] = []): Promise<Payload[]> {
     await this.started('throw')
     const errors: Error[] = []
     await this.emit('reportStart', { inPayloads: payloads, module: this as SentinelModule })
@@ -43,47 +41,12 @@ export class MemorySentinel<
       })
     }
 
-    const [[boundWitness]] = await this.bindQueryResult({ schema: SentinelReportQuerySchema }, resultPayloads)
+    const [boundWitness] = await this.bindQueryResult({ schema: SentinelReportQuerySchema }, resultPayloads)
     this.history.push(assertEx(boundWitness))
     await this.emit('reportEnd', { boundWitness, errors, inPayloads: payloads, module: this as SentinelModule, outPayloads: resultPayloads })
     return [boundWitness, ...resultPayloads]
   }
 
-  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
-    query: T,
-    payloads?: Payload[],
-    queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
-    const wrapper = QueryBoundWitnessWrapper.parseQuery<SentinelQuery>(query, payloads)
-    const queryPayload = await wrapper.getQuery()
-    assertEx(this.queryable(query, payloads, queryConfig))
-    const queryAccount = Account.randomSync()
-    const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    try {
-      switch (queryPayload.schema) {
-        case SentinelReportQuerySchema: {
-          resultPayloads.push(...(await this.report(payloads)))
-          break
-        }
-        default:
-          return super.queryHandler(query, payloads)
-      }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
-    }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
-  }
-
   private async generateResults(witnesses: WitnessInstance[]): Promise<[Payload[], Error[]]> {
     const results = await Promise.allSettled(witnesses?.map((witness) => witness.observe()))
     const payloads = results
diff --git a/packages/modules/packages/sentinel/tsconfig.json b/packages/modules/packages/sentinel/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/modules/packages/sentinel/tsconfig.json
+++ b/packages/modules/packages/sentinel/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/sentinel/tsconfig.typedoc.json b/packages/modules/packages/sentinel/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/sentinel/tsconfig.typedoc.json
+++ b/packages/modules/packages/sentinel/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts b/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts
index 5837a37d0b0..5712e91c65f 100644
--- a/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts
+++ b/packages/modules/packages/witness/packages/abstract/src/AbstractWitness.ts
@@ -1,9 +1,7 @@
 import { assertEx } from '@xylabs/assert'
-import { HDWallet } from '@xyo-network/account'
 import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { PayloadHasher } from '@xyo-network/core'
-import { handleErrorAsync } from '@xyo-network/error'
-import { AbstractModuleInstance, creatableModule, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
+import { AbstractModuleInstance, creatableModule, ModuleConfig, ModuleQueryHandlerResult } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 import {
@@ -41,50 +39,38 @@ export abstract class AbstractWitness<
     }
   }
 
-  async observe(payloads?: Payload[]): Promise<Payload[]> {
+  async observe(inPayloads?: Payload[]): Promise<Payload[]> {
     await this.started('throw')
-    const payloadList = assertEx(await this.observeHandler(payloads), 'Trying to witness nothing')
-    assertEx(payloadList.length > 0, 'Trying to witness empty list')
-    payloadList?.forEach((payload) => assertEx(payload.schema, 'observe: Missing Schema'))
-    return payloadList
+    await this.emit('reportStart', { inPayloads: inPayloads, module: this })
+    const outPayloads = assertEx(await this.observeHandler(inPayloads), 'Trying to witness nothing')
+    assertEx(outPayloads.length > 0, 'Trying to witness empty list')
+    outPayloads?.forEach((payload) => assertEx(payload.schema, 'observe: Missing Schema'))
+    await this.emit('reportEnd', { inPayloads, module: this, outPayloads })
+    return outPayloads
   }
 
   protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
+  ): Promise<ModuleQueryHandlerResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<WitnessQuery>(query, payloads)
     const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
+    const resultPayloads: Payload[] = []
     // Remove the query payload from the arguments passed to us so we don't observe it
     const filteredObservation = await PayloadHasher.filterExclude(payloads, query.query)
-    const queryAccount = this.ephemeralQueryAccountEnabled ? await HDWallet.random() : undefined
-    try {
-      switch (queryPayload.schema) {
-        case WitnessObserveQuerySchema: {
-          await this.emit('reportStart', { inPayloads: payloads, module: this })
-          const resultPayloads = await this.observe(filteredObservation)
-          await this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads })
-          return (await this.bindQueryResult(queryPayload, resultPayloads, queryAccount ? [queryAccount] : []))[0]
-        }
-        default: {
-          return super.queryHandler(query, payloads)
-        }
+    switch (queryPayload.schema) {
+      case WitnessObserveQuerySchema: {
+        const observePayloads = await this.observe(filteredObservation)
+        resultPayloads.push(...observePayloads)
+        break
+      }
+      default: {
+        return super.queryHandler(query, payloads)
       }
-    } catch (ex) {
-      return handleErrorAsync(ex, async (error) => {
-        const [result] = await this.bindQueryResult(queryPayload, [], queryAccount ? [queryAccount] : [], [
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        ])
-        return result
-      })
     }
+    return resultPayloads
   }
 
   protected abstract observeHandler(payloads?: Payload[]): Promisable<Payload[]>
diff --git a/packages/modules/packages/witness/packages/abstract/tsconfig.json b/packages/modules/packages/witness/packages/abstract/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/witness/packages/abstract/tsconfig.json
+++ b/packages/modules/packages/witness/packages/abstract/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/witness/packages/abstract/tsconfig.typedoc.json b/packages/modules/packages/witness/packages/abstract/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/witness/packages/abstract/tsconfig.typedoc.json
+++ b/packages/modules/packages/witness/packages/abstract/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/witness/packages/model/tsconfig.json b/packages/modules/packages/witness/packages/model/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/witness/packages/model/tsconfig.json
+++ b/packages/modules/packages/witness/packages/model/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/witness/packages/model/tsconfig.typedoc.json b/packages/modules/packages/witness/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/witness/packages/model/tsconfig.typedoc.json
+++ b/packages/modules/packages/witness/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/witness/packages/timestamp/tsconfig.json b/packages/modules/packages/witness/packages/timestamp/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/witness/packages/timestamp/tsconfig.json
+++ b/packages/modules/packages/witness/packages/timestamp/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/witness/packages/timestamp/tsconfig.typedoc.json b/packages/modules/packages/witness/packages/timestamp/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/witness/packages/timestamp/tsconfig.typedoc.json
+++ b/packages/modules/packages/witness/packages/timestamp/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/witness/packages/wrapper/tsconfig.json b/packages/modules/packages/witness/packages/wrapper/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/witness/packages/wrapper/tsconfig.json
+++ b/packages/modules/packages/witness/packages/wrapper/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/witness/packages/wrapper/tsconfig.typedoc.json b/packages/modules/packages/witness/packages/wrapper/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/witness/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/modules/packages/witness/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/packages/witness/tsconfig.json b/packages/modules/packages/witness/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/packages/witness/tsconfig.json
+++ b/packages/modules/packages/witness/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/modules/packages/witness/tsconfig.typedoc.json b/packages/modules/packages/witness/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/modules/packages/witness/tsconfig.typedoc.json
+++ b/packages/modules/packages/witness/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/modules/tsconfig.json b/packages/modules/tsconfig.json
index 5a649e80a18..9aeeeacc10b 100644
--- a/packages/modules/tsconfig.json
+++ b/packages/modules/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/mongo/tsconfig.json b/packages/mongo/tsconfig.json
index 6e4883a949e..ee61985eb0f 100644
--- a/packages/mongo/tsconfig.json
+++ b/packages/mongo/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
\ No newline at end of file
diff --git a/packages/mongo/tsconfig.typedoc.json b/packages/mongo/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/mongo/tsconfig.typedoc.json
+++ b/packages/mongo/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/packages/app/tsconfig.json b/packages/node/packages/core/packages/app/tsconfig.json
index 8ed240d6e03..f7802a5aea7 100644
--- a/packages/node/packages/core/packages/app/tsconfig.json
+++ b/packages/node/packages/core/packages/app/tsconfig.json
@@ -6,6 +6,6 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
diff --git a/packages/node/packages/core/packages/app/tsconfig.typedoc.json b/packages/node/packages/core/packages/app/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/packages/app/tsconfig.typedoc.json
+++ b/packages/node/packages/core/packages/app/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.json b/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.json
+++ b/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.typedoc.json b/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.typedoc.json
+++ b/packages/node/packages/core/packages/forecasting/packages/arima/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/packages/lib/tsconfig.json b/packages/node/packages/core/packages/lib/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/core/packages/lib/tsconfig.json
+++ b/packages/node/packages/core/packages/lib/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/core/packages/lib/tsconfig.typedoc.json b/packages/node/packages/core/packages/lib/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/packages/lib/tsconfig.typedoc.json
+++ b/packages/node/packages/core/packages/lib/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/packages/model/tsconfig.json b/packages/node/packages/core/packages/model/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/core/packages/model/tsconfig.json
+++ b/packages/node/packages/core/packages/model/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/core/packages/model/tsconfig.typedoc.json b/packages/node/packages/core/packages/model/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/packages/model/tsconfig.typedoc.json
+++ b/packages/node/packages/core/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/DeterministicArchivist.ts b/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/DeterministicArchivist.ts
index 1596262a0ee..75b1d572ae3 100644
--- a/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/DeterministicArchivist.ts
+++ b/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/DeterministicArchivist.ts
@@ -1,23 +1,12 @@
-import { assertEx } from '@xylabs/assert'
 import { exists } from '@xylabs/exists'
 import { fulfilledValues } from '@xylabs/promise'
-import { Account } from '@xyo-network/account'
-import {
-  AbstractArchivist,
-  ArchivistConfig,
-  ArchivistConfigSchema,
-  ArchivistGetQuerySchema,
-  ArchivistInsertQuerySchema,
-  ArchivistParams,
-  ArchivistQuery,
-} from '@xyo-network/archivist'
-import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
+import { AbstractArchivist, ArchivistConfig, ArchivistConfigSchema, ArchivistInsertQuerySchema, ArchivistParams } from '@xyo-network/archivist'
+import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { handleErrorAsync } from '@xyo-network/error'
-import { AnyConfigSchema, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module'
 import { BoundWitnessWithMeta, PayloadWithMeta, PayloadWithPartialMeta } from '@xyo-network/node-core-model'
-import { ModuleError, Payload } from '@xyo-network/payload-model'
+import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { BaseMongoSdk } from '@xyo-network/sdk-xyo-mongo-js'
 
@@ -79,7 +68,7 @@ export class MongoDBDeterministicArchivist<
     return succeeded.filter(exists).map(toReturnValue)
   }
 
-  protected override async insertHandler(payloads?: Payload[]): Promise<BoundWitness[]> {
+  protected override async insertHandler(payloads?: Payload[]): Promise<Payload[]> {
     const [bw, p] = await validByType(payloads)
     const boundWitnesses = await Promise.all(bw.map((x) => toBoundWitnessWithMeta(x)))
     const payloadsWithMeta = await Promise.all(p.map((x) => toPayloadWithMeta(x)))
@@ -93,49 +82,6 @@ export class MongoDBDeterministicArchivist<
       if (!payloadsResult.acknowledged || payloadsResult.insertedCount !== payloadsWithMeta.length)
         throw new Error('MongoDBDeterministicArchivist: Error inserting Payloads')
     }
-    return boundWitnesses
-  }
-
-  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
-    query: T,
-    payloads?: Payload[],
-    queryConfig?: TConfig,
-  ): Promise<ModuleQueryResult> {
-    const wrapper = QueryBoundWitnessWrapper.parseQuery<ArchivistQuery>(query, payloads)
-    const queryPayload = await wrapper.getQuery()
-    assertEx(this.queryable(query, payloads, queryConfig))
-    const resultPayloads: Payload[] = []
-    const errorPayloads: ModuleError[] = []
-    // TODO: Use new Account once we mock Account.new in Jest
-    const queryAccount = Account.randomSync()
-    // const queryAccount = Account.randomSync()
-    try {
-      switch (queryPayload.schema) {
-        case ArchivistGetQuerySchema: {
-          resultPayloads.push(...(await this.getHandler(queryPayload.hashes)))
-          break
-        }
-        case ArchivistInsertQuerySchema: {
-          await this.insertHandler([wrapper.boundwitness, ...(payloads ?? [])])
-          const [bw] = (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
-          //we do not send back the inserted payloads since we assume the caller knows them
-          return [bw, [], []]
-        }
-        default:
-          return super.queryHandler(query, payloads)
-      }
-    } catch (ex) {
-      await handleErrorAsync(ex, async (error) => {
-        errorPayloads.push(
-          new ModuleErrorBuilder()
-            .sources([await wrapper.hashAsync()])
-            .name(this.config.name ?? '<Unknown>')
-            .query(query.schema)
-            .message(error.message)
-            .build(),
-        )
-      })
-    }
-    return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0]
+    return payloads ?? []
   }
 }
diff --git a/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/spec/DeterministicArchivist.spec.ts b/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/spec/DeterministicArchivist.spec.ts
index 811311b7c77..ae2fc07ce8c 100644
--- a/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/spec/DeterministicArchivist.spec.ts
+++ b/packages/node/packages/core/packages/modules-mongo/src/Archivist/Deterministic/spec/DeterministicArchivist.spec.ts
@@ -7,7 +7,6 @@ import { Account } from '@xyo-network/account'
 import { AccountInstance } from '@xyo-network/account-model'
 import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
 import { BoundWitnessWithMeta, PayloadWithMeta } from '@xyo-network/node-core-model'
 import { Payload } from '@xyo-network/payload-model'
@@ -29,10 +28,10 @@ describeIf(canAddMongoModules())('DeterministicArchivist', () => {
   const payloadWrappers: PayloadWrapper[] = []
   const boundWitnessWrappers: BoundWitnessWrapper[] = []
   let archivist: ArchivistWrapper
-  let insertResult1: BoundWitness[]
+  let insertResult1: Payload[]
   // let insertResult2: BoundWitness[]
-  let insertResult3: BoundWitness[]
-  const insertResults: BoundWitness[][] = []
+  let insertResult3: Payload[]
+  const insertResults: Payload[][] = []
   beforeAll(async () => {
     archiveAccount = await Account.create({ phrase: 'temp' })
 
@@ -85,12 +84,17 @@ describeIf(canAddMongoModules())('DeterministicArchivist', () => {
       [boundWitness2, payload2],
       [boundWitness3, payload3, payload4],
     ]
-    for (const insertion of insertions) {
-      const insertionResult = await archivist.insert(insertion)
-      insertResults.push(insertionResult)
-      // NOTE: Increment Date.now after each insert so that DB sorting by time works
-      timestamp++
-    }
+    insertResults.push(
+      ...(await Promise.all(
+        insertions.map(async (insertion) => {
+          const result = await archivist.insert(insertion)
+          // NOTE: Increment Date.now after each insert so that DB sorting by time works
+          timestamp++
+          return result
+        }),
+      )),
+    )
+
     insertResult1 = insertResults[0]
     // insertResult2 = insertResults[1]
     insertResult3 = insertResults[2]
@@ -105,7 +109,7 @@ describeIf(canAddMongoModules())('DeterministicArchivist', () => {
   describe('insert', () => {
     it('inserts single payload', () => {
       expect(insertResult1).toBeTruthy()
-      expect(insertResult1).toBeArrayOfSize(1)
+      expect(insertResult1).toBeArrayOfSize(2)
       /*
       const [boundResult] = insertResult1
       expect(boundResult.addresses).toContain(archivist.address)
@@ -122,7 +126,7 @@ describeIf(canAddMongoModules())('DeterministicArchivist', () => {
     })
     it('inserts multiple payloads', () => {
       expect(insertResult3).toBeTruthy()
-      expect(insertResult3).toBeArrayOfSize(1)
+      expect(insertResult3).toBeArrayOfSize(3)
       /*const [boundResult, transactionResults] = insertResult3
       expect(boundResult.addresses).toContain(archivist.address)
       expect(transactionResults.addresses).toContain(moduleAccount.public.address.hex)
diff --git a/packages/node/packages/core/packages/modules-mongo/tsconfig.json b/packages/node/packages/core/packages/modules-mongo/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/core/packages/modules-mongo/tsconfig.json
+++ b/packages/node/packages/core/packages/modules-mongo/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/core/packages/modules-mongo/tsconfig.typedoc.json b/packages/node/packages/core/packages/modules-mongo/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/packages/modules-mongo/tsconfig.typedoc.json
+++ b/packages/node/packages/core/packages/modules-mongo/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/packages/types/tsconfig.typedoc.json b/packages/node/packages/core/packages/types/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/packages/types/tsconfig.typedoc.json
+++ b/packages/node/packages/core/packages/types/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/core/tsconfig.json b/packages/node/packages/core/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/core/tsconfig.json
+++ b/packages/node/packages/core/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/core/tsconfig.typedoc.json b/packages/node/packages/core/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/core/tsconfig.typedoc.json
+++ b/packages/node/packages/core/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/express/packages/dependencies/tsconfig.json b/packages/node/packages/express/packages/dependencies/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/express/packages/dependencies/tsconfig.json
+++ b/packages/node/packages/express/packages/dependencies/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/express/packages/dependencies/tsconfig.typedoc.json b/packages/node/packages/express/packages/dependencies/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/express/packages/dependencies/tsconfig.typedoc.json
+++ b/packages/node/packages/express/packages/dependencies/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/express/packages/lib/tsconfig.json b/packages/node/packages/express/packages/lib/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/express/packages/lib/tsconfig.json
+++ b/packages/node/packages/express/packages/lib/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/express/packages/lib/tsconfig.typedoc.json b/packages/node/packages/express/packages/lib/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/express/packages/lib/tsconfig.typedoc.json
+++ b/packages/node/packages/express/packages/lib/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/express/packages/middleware/tsconfig.json b/packages/node/packages/express/packages/middleware/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/express/packages/middleware/tsconfig.json
+++ b/packages/node/packages/express/packages/middleware/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/express/packages/middleware/tsconfig.typedoc.json b/packages/node/packages/express/packages/middleware/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/express/packages/middleware/tsconfig.typedoc.json
+++ b/packages/node/packages/express/packages/middleware/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/express/packages/routes/tsconfig.json b/packages/node/packages/express/packages/routes/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/express/packages/routes/tsconfig.json
+++ b/packages/node/packages/express/packages/routes/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/express/packages/routes/tsconfig.typedoc.json b/packages/node/packages/express/packages/routes/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/express/packages/routes/tsconfig.typedoc.json
+++ b/packages/node/packages/express/packages/routes/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/express/packages/server/tsconfig.json b/packages/node/packages/express/packages/server/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/express/packages/server/tsconfig.json
+++ b/packages/node/packages/express/packages/server/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/packages/express/packages/server/tsconfig.typedoc.json b/packages/node/packages/express/packages/server/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/packages/express/packages/server/tsconfig.typedoc.json
+++ b/packages/node/packages/express/packages/server/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/node/packages/express/packages/test/src/routes/hash/get/get.boundWitnessPointer.spec.ts b/packages/node/packages/express/packages/test/src/routes/hash/get/get.boundWitnessPointer.spec.ts
index 971653c801e..4ea7a04335c 100644
--- a/packages/node/packages/express/packages/test/src/routes/hash/get/get.boundWitnessPointer.spec.ts
+++ b/packages/node/packages/express/packages/test/src/routes/hash/get/get.boundWitnessPointer.spec.ts
@@ -53,7 +53,7 @@ const createPointer = async (
 const expectError = (result: Payload, detail: string, status: string, title?: string) => {
   expect(result).toBeObject()
   const error = result as unknown as { errors: { detail: string; status: string; title?: string }[] }
-  expect(error.errors).toBeArrayOfSize(1)
+  expect(error.errors?.length).toBeGreaterThan(0)
   const expected = title ? { detail, status, title } : { detail, status }
   expect(error.errors[0]).toEqual(expected)
 }
diff --git a/packages/node/packages/express/tsconfig.json b/packages/node/packages/express/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/packages/express/tsconfig.json
+++ b/packages/node/packages/express/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/node/tsconfig.json
+++ b/packages/node/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/node/tsconfig.typedoc.json b/packages/node/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/node/tsconfig.typedoc.json
+++ b/packages/node/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/address/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/address/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/address/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/address/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/packages/ethereum/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/blockchain/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/blockchain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/blockchain/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/blockchain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/config/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/config/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/config/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/config/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/cards/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/cards/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/cards/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/cards/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/market/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/market/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/market/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/market/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/nft/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/nft/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/nft/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/nft/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/packages/transaction/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/packages/transaction/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/packages/transaction/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/packages/transaction/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/crypto/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/crypto/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/crypto/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/crypto/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/domain/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/domain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/domain/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/domain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/elevation/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/elevation/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/elevation/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/elevation/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/id/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/id/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/id/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/id/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/location-certainty/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/location-certainty/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/location-certainty/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/location-certainty/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/location/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/location/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/location/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/location/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/module-instance/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/module-instance/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/module-instance/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/module-instance/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/pentair/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/pentair/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/pentair/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/pentair/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/query/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/query/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/query/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/query/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/schema/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/schema/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/schema/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/schema/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/system/packages/info/packages/node/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/system/packages/info/packages/node/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/system/packages/info/packages/node/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/system/packages/info/packages/node/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/system/packages/info/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/system/packages/info/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/system/packages/info/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/system/packages/info/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/system/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/system/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/system/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/system/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/packages/url/tsconfig.typedoc.json b/packages/plugins/packages/payload/packages/url/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/packages/url/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/packages/url/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payload/tsconfig.typedoc.json b/packages/plugins/packages/payload/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payload/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payload/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/blocknative/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/packages/v2/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherchain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethers/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/etherscan/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/ethgasstation/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/packages/gas/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/packages/gas/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/packages/ethereum/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/blockchain/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/blockchain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/blockchain/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/blockchain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/game/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/cards/packages/move/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/cards/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/cards/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/cards/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/cards/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/asset/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/coingecko/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/market/packages/uniswap/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/market/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/market/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/market/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/market/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/nft/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/nft/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/nft/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/nft/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/packages/transaction/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/packages/transaction/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/packages/transaction/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/packages/transaction/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/crypto/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/crypto/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/crypto/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/crypto/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/domain/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/domain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/domain/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/domain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/elevation/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/elevation/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/elevation/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/elevation/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/id/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/id/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/id/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/id/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/location-certainty/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/location-certainty/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/location-certainty/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/location-certainty/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/location/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/location/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/location/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/location/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/module-instance/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/module-instance/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/module-instance/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/module-instance/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/pentair/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/pentair/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/pentair/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/pentair/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/prometheus/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/prometheus/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/prometheus/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/prometheus/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/schema/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/schema/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/schema/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/schema/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/system/packages/info/packages/bowser/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/system/packages/info/packages/node/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/system/packages/info/packages/node/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/system/packages/info/packages/node/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/system/packages/info/packages/node/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/system/packages/info/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/system/packages/info/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/system/packages/info/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/system/packages/info/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/system/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/system/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/system/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/system/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/packages/url/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/packages/url/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/packages/url/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/packages/url/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/packages/payloadset/tsconfig.typedoc.json b/packages/plugins/packages/payloadset/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/packages/payloadset/tsconfig.typedoc.json
+++ b/packages/plugins/packages/payloadset/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/plugins/tsconfig.typedoc.json b/packages/plugins/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/plugins/tsconfig.typedoc.json
+++ b/packages/plugins/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/account-model/tsconfig.json b/packages/protocol/packages/account/packages/account-model/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/account-model/tsconfig.json
+++ b/packages/protocol/packages/account/packages/account-model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/account-model/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/account-model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/account-model/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/account-model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/keypair-model/tsconfig.json b/packages/protocol/packages/account/packages/keypair-model/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/keypair-model/tsconfig.json
+++ b/packages/protocol/packages/account/packages/keypair-model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/keypair-model/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/keypair-model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/keypair-model/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/keypair-model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.json b/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/packages/indexeddb/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.json b/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.json b/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/packages/storage/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.json b/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/previous-hash-store/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/packages/wallet-model/tsconfig.json b/packages/protocol/packages/account/packages/wallet-model/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/account/packages/wallet-model/tsconfig.json
+++ b/packages/protocol/packages/account/packages/wallet-model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/packages/wallet-model/tsconfig.typedoc.json b/packages/protocol/packages/account/packages/wallet-model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/packages/wallet-model/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/packages/wallet-model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/account/tsconfig.json b/packages/protocol/packages/account/tsconfig.json
index 567b6ab833e..e6720daf24f 100644
--- a/packages/protocol/packages/account/tsconfig.json
+++ b/packages/protocol/packages/account/tsconfig.json
@@ -5,7 +5,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/account/tsconfig.typedoc.json b/packages/protocol/packages/account/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/account/tsconfig.typedoc.json
+++ b/packages/protocol/packages/account/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/bip39/tsconfig.json b/packages/protocol/packages/bip39/tsconfig.json
index 567b6ab833e..e6720daf24f 100644
--- a/packages/protocol/packages/bip39/tsconfig.json
+++ b/packages/protocol/packages/bip39/tsconfig.json
@@ -5,7 +5,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/bip39/tsconfig.typedoc.json b/packages/protocol/packages/bip39/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/bip39/tsconfig.typedoc.json
+++ b/packages/protocol/packages/bip39/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/builder/tsconfig.json b/packages/protocol/packages/boundwitness/packages/builder/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/boundwitness/packages/builder/tsconfig.json
+++ b/packages/protocol/packages/boundwitness/packages/builder/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/builder/tsconfig.typedoc.json b/packages/protocol/packages/boundwitness/packages/builder/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/boundwitness/packages/builder/tsconfig.typedoc.json
+++ b/packages/protocol/packages/boundwitness/packages/builder/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/model/tsconfig.json b/packages/protocol/packages/boundwitness/packages/model/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/boundwitness/packages/model/tsconfig.json
+++ b/packages/protocol/packages/boundwitness/packages/model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/model/tsconfig.typedoc.json b/packages/protocol/packages/boundwitness/packages/model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/boundwitness/packages/model/tsconfig.typedoc.json
+++ b/packages/protocol/packages/boundwitness/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/validator/tsconfig.json b/packages/protocol/packages/boundwitness/packages/validator/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/boundwitness/packages/validator/tsconfig.json
+++ b/packages/protocol/packages/boundwitness/packages/validator/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/validator/tsconfig.typedoc.json b/packages/protocol/packages/boundwitness/packages/validator/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/boundwitness/packages/validator/tsconfig.typedoc.json
+++ b/packages/protocol/packages/boundwitness/packages/validator/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.json b/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.json
+++ b/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.typedoc.json b/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/protocol/packages/boundwitness/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/boundwitness/tsconfig.json b/packages/protocol/packages/boundwitness/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/boundwitness/tsconfig.json
+++ b/packages/protocol/packages/boundwitness/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/boundwitness/tsconfig.typedoc.json b/packages/protocol/packages/boundwitness/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/boundwitness/tsconfig.typedoc.json
+++ b/packages/protocol/packages/boundwitness/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/core/tsconfig.json b/packages/protocol/packages/core/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/core/tsconfig.json
+++ b/packages/protocol/packages/core/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/core/tsconfig.typedoc.json b/packages/protocol/packages/core/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/core/tsconfig.typedoc.json
+++ b/packages/protocol/packages/core/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/payload/packages/builder/tsconfig.json b/packages/protocol/packages/payload/packages/builder/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/payload/packages/builder/tsconfig.json
+++ b/packages/protocol/packages/payload/packages/builder/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/payload/packages/builder/tsconfig.typedoc.json b/packages/protocol/packages/payload/packages/builder/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/payload/packages/builder/tsconfig.typedoc.json
+++ b/packages/protocol/packages/payload/packages/builder/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/payload/packages/huri/tsconfig.json b/packages/protocol/packages/payload/packages/huri/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/payload/packages/huri/tsconfig.json
+++ b/packages/protocol/packages/payload/packages/huri/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/payload/packages/huri/tsconfig.typedoc.json b/packages/protocol/packages/payload/packages/huri/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/payload/packages/huri/tsconfig.typedoc.json
+++ b/packages/protocol/packages/payload/packages/huri/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/payload/packages/model/tsconfig.json b/packages/protocol/packages/payload/packages/model/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/payload/packages/model/tsconfig.json
+++ b/packages/protocol/packages/payload/packages/model/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/payload/packages/model/tsconfig.typedoc.json b/packages/protocol/packages/payload/packages/model/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/payload/packages/model/tsconfig.typedoc.json
+++ b/packages/protocol/packages/payload/packages/model/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/payload/packages/validator/tsconfig.json b/packages/protocol/packages/payload/packages/validator/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/payload/packages/validator/tsconfig.json
+++ b/packages/protocol/packages/payload/packages/validator/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/payload/packages/validator/tsconfig.typedoc.json b/packages/protocol/packages/payload/packages/validator/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/payload/packages/validator/tsconfig.typedoc.json
+++ b/packages/protocol/packages/payload/packages/validator/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/payload/packages/wrapper/tsconfig.json b/packages/protocol/packages/payload/packages/wrapper/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/payload/packages/wrapper/tsconfig.json
+++ b/packages/protocol/packages/payload/packages/wrapper/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/payload/packages/wrapper/tsconfig.typedoc.json b/packages/protocol/packages/payload/packages/wrapper/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/payload/packages/wrapper/tsconfig.typedoc.json
+++ b/packages/protocol/packages/payload/packages/wrapper/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/packages/payload/tsconfig.json b/packages/protocol/packages/payload/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/protocol/packages/payload/tsconfig.json
+++ b/packages/protocol/packages/payload/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/packages/payload/tsconfig.typedoc.json b/packages/protocol/packages/payload/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/packages/payload/tsconfig.typedoc.json
+++ b/packages/protocol/packages/payload/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/protocol/tsconfig.json b/packages/protocol/tsconfig.json
index 567b6ab833e..e6720daf24f 100644
--- a/packages/protocol/tsconfig.json
+++ b/packages/protocol/tsconfig.json
@@ -5,7 +5,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/protocol/tsconfig.typedoc.json b/packages/protocol/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/protocol/tsconfig.typedoc.json
+++ b/packages/protocol/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/api-models/tsconfig.json b/packages/sdk/packages/api-models/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/api-models/tsconfig.json
+++ b/packages/sdk/packages/api-models/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/api-models/tsconfig.typedoc.json b/packages/sdk/packages/api-models/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/api-models/tsconfig.typedoc.json
+++ b/packages/sdk/packages/api-models/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/api/tsconfig.json b/packages/sdk/packages/api/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/api/tsconfig.json
+++ b/packages/sdk/packages/api/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/api/tsconfig.typedoc.json b/packages/sdk/packages/api/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/api/tsconfig.typedoc.json
+++ b/packages/sdk/packages/api/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/axios/tsconfig.json b/packages/sdk/packages/axios/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/axios/tsconfig.json
+++ b/packages/sdk/packages/axios/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/axios/tsconfig.typedoc.json b/packages/sdk/packages/axios/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/axios/tsconfig.typedoc.json
+++ b/packages/sdk/packages/axios/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/dns/tsconfig.json b/packages/sdk/packages/dns/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/dns/tsconfig.json
+++ b/packages/sdk/packages/dns/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/dns/tsconfig.typedoc.json b/packages/sdk/packages/dns/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/dns/tsconfig.typedoc.json
+++ b/packages/sdk/packages/dns/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/domain/tsconfig.json b/packages/sdk/packages/domain/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/domain/tsconfig.json
+++ b/packages/sdk/packages/domain/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/domain/tsconfig.typedoc.json b/packages/sdk/packages/domain/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/domain/tsconfig.typedoc.json
+++ b/packages/sdk/packages/domain/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/error/tsconfig.json b/packages/sdk/packages/error/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/error/tsconfig.json
+++ b/packages/sdk/packages/error/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/error/tsconfig.typedoc.json b/packages/sdk/packages/error/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/error/tsconfig.typedoc.json
+++ b/packages/sdk/packages/error/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/identity/tsconfig.json b/packages/sdk/packages/identity/tsconfig.json
index 3001f745df5..f940232246f 100644
--- a/packages/sdk/packages/identity/tsconfig.json
+++ b/packages/sdk/packages/identity/tsconfig.json
@@ -5,7 +5,7 @@
     "typeRoots": []
   },
 
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/identity/tsconfig.typedoc.json b/packages/sdk/packages/identity/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/identity/tsconfig.typedoc.json
+++ b/packages/sdk/packages/identity/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/logger/tsconfig.json b/packages/sdk/packages/logger/tsconfig.json
index 3001f745df5..f940232246f 100644
--- a/packages/sdk/packages/logger/tsconfig.json
+++ b/packages/sdk/packages/logger/tsconfig.json
@@ -5,7 +5,7 @@
     "typeRoots": []
   },
 
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/logger/tsconfig.typedoc.json b/packages/sdk/packages/logger/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/logger/tsconfig.typedoc.json
+++ b/packages/sdk/packages/logger/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/metamask-connector/tsconfig.json b/packages/sdk/packages/metamask-connector/tsconfig.json
index 5ada8b508c8..531c81092c2 100644
--- a/packages/sdk/packages/metamask-connector/tsconfig.json
+++ b/packages/sdk/packages/metamask-connector/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig-dom"
 }
\ No newline at end of file
diff --git a/packages/sdk/packages/metamask-connector/tsconfig.typedoc.json b/packages/sdk/packages/metamask-connector/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/sdk/packages/metamask-connector/tsconfig.typedoc.json
+++ b/packages/sdk/packages/metamask-connector/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/network/tsconfig.json b/packages/sdk/packages/network/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/network/tsconfig.json
+++ b/packages/sdk/packages/network/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/network/tsconfig.typedoc.json b/packages/sdk/packages/network/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/sdk/packages/network/tsconfig.typedoc.json
+++ b/packages/sdk/packages/network/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/payload-plugin/tsconfig.json b/packages/sdk/packages/payload-plugin/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/payload-plugin/tsconfig.json
+++ b/packages/sdk/packages/payload-plugin/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/payload-plugin/tsconfig.typedoc.json b/packages/sdk/packages/payload-plugin/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/sdk/packages/payload-plugin/tsconfig.typedoc.json
+++ b/packages/sdk/packages/payload-plugin/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/payloadset-plugin/tsconfig.json b/packages/sdk/packages/payloadset-plugin/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/payloadset-plugin/tsconfig.json
+++ b/packages/sdk/packages/payloadset-plugin/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/payloadset-plugin/tsconfig.typedoc.json b/packages/sdk/packages/payloadset-plugin/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/sdk/packages/payloadset-plugin/tsconfig.typedoc.json
+++ b/packages/sdk/packages/payloadset-plugin/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/quadkey/tsconfig.json b/packages/sdk/packages/quadkey/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/quadkey/tsconfig.json
+++ b/packages/sdk/packages/quadkey/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/quadkey/tsconfig.typedoc.json b/packages/sdk/packages/quadkey/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/sdk/packages/quadkey/tsconfig.typedoc.json
+++ b/packages/sdk/packages/quadkey/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/schema-cache/tsconfig.json b/packages/sdk/packages/schema-cache/tsconfig.json
index 5ada8b508c8..531c81092c2 100644
--- a/packages/sdk/packages/schema-cache/tsconfig.json
+++ b/packages/sdk/packages/schema-cache/tsconfig.json
@@ -4,6 +4,6 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig-dom"
 }
\ No newline at end of file
diff --git a/packages/sdk/packages/schema-cache/tsconfig.typedoc.json b/packages/sdk/packages/schema-cache/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/schema-cache/tsconfig.typedoc.json
+++ b/packages/sdk/packages/schema-cache/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/schema-name-validator/tsconfig.json b/packages/sdk/packages/schema-name-validator/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/packages/schema-name-validator/tsconfig.json
+++ b/packages/sdk/packages/schema-name-validator/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/schema-name-validator/tsconfig.typedoc.json b/packages/sdk/packages/schema-name-validator/tsconfig.typedoc.json
index a77abc2f4f0..8e79a613f42 100644
--- a/packages/sdk/packages/schema-name-validator/tsconfig.typedoc.json
+++ b/packages/sdk/packages/schema-name-validator/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "dist", "docs", "packages"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/packages/witnesses/tsconfig.json b/packages/sdk/packages/witnesses/tsconfig.json
index d3dc0945af0..dfeb79d2b4a 100644
--- a/packages/sdk/packages/witnesses/tsconfig.json
+++ b/packages/sdk/packages/witnesses/tsconfig.json
@@ -6,7 +6,7 @@
     "experimentalDecorators": true,
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/packages/witnesses/tsconfig.typedoc.json b/packages/sdk/packages/witnesses/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/packages/witnesses/tsconfig.typedoc.json
+++ b/packages/sdk/packages/witnesses/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/sdk/tsconfig.json
+++ b/packages/sdk/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/sdk/tsconfig.typedoc.json b/packages/sdk/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/sdk/tsconfig.typedoc.json
+++ b/packages/sdk/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/shared/packages/promisable/tsconfig.json b/packages/shared/packages/promisable/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/shared/packages/promisable/tsconfig.json
+++ b/packages/shared/packages/promisable/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/shared/packages/promisable/tsconfig.typedoc.json b/packages/shared/packages/promisable/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/shared/packages/promisable/tsconfig.typedoc.json
+++ b/packages/shared/packages/promisable/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/shared/packages/promise/tsconfig.json b/packages/shared/packages/promise/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/shared/packages/promise/tsconfig.json
+++ b/packages/shared/packages/promise/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/shared/packages/promise/tsconfig.typedoc.json b/packages/shared/packages/promise/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/shared/packages/promise/tsconfig.typedoc.json
+++ b/packages/shared/packages/promise/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/shared/packages/typeof/tsconfig.json b/packages/shared/packages/typeof/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/shared/packages/typeof/tsconfig.json
+++ b/packages/shared/packages/typeof/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/shared/packages/typeof/tsconfig.typedoc.json b/packages/shared/packages/typeof/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/shared/packages/typeof/tsconfig.typedoc.json
+++ b/packages/shared/packages/typeof/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
index 0310ffb6a0a..3e86a18183e 100644
--- a/packages/shared/tsconfig.json
+++ b/packages/shared/tsconfig.json
@@ -4,7 +4,7 @@
     "declarationDir": "./dist/types",
     "typeRoots": []
   },
-  "exclude": ["dist"],
+  "exclude": ["dist", "docs"],
   "extends": "@xylabs/tsconfig"
 }
 
diff --git a/packages/shared/tsconfig.typedoc.json b/packages/shared/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/packages/shared/tsconfig.typedoc.json
+++ b/packages/shared/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }
 
diff --git a/tsconfig.typedoc.json b/tsconfig.typedoc.json
index dc5aa20842b..0919ecb67d7 100644
--- a/tsconfig.typedoc.json
+++ b/tsconfig.typedoc.json
@@ -1,5 +1,5 @@
 {
-  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*"],
+  "exclude": ["**/spec/*", "**/*.spec.*", "**/packages/*", "dist"],
   "extends": "./tsconfig.json"
 }