diff --git a/__output__/builder/bundler_test/contracts/contracts-context.tsx b/__output__/builder/bundler_test/contracts/contracts-context.tsx
index d972e515..74cb9c9f 100644
--- a/__output__/builder/bundler_test/contracts/contracts-context.tsx
+++ b/__output__/builder/bundler_test/contracts/contracts-context.tsx
@@ -13,7 +13,7 @@ import {
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
-interface ContractsConfig {
+export interface ContractsConfig {
   address: string | undefined;
   getCosmWasmClient: () => Promise<CosmWasmClient>;
   getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
diff --git a/__output__/builder/default/contracts-context.tsx b/__output__/builder/default/contracts-context.tsx
index d972e515..74cb9c9f 100644
--- a/__output__/builder/default/contracts-context.tsx
+++ b/__output__/builder/default/contracts-context.tsx
@@ -13,7 +13,7 @@ import {
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
-interface ContractsConfig {
+export interface ContractsConfig {
   address: string | undefined;
   getCosmWasmClient: () => Promise<CosmWasmClient>;
   getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
diff --git a/packages/ts-codegen/src/helpers/contractsContextTSX.ts b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
index 03a439b6..a247f243 100644
--- a/packages/ts-codegen/src/helpers/contractsContextTSX.ts
+++ b/packages/ts-codegen/src/helpers/contractsContextTSX.ts
@@ -7,7 +7,7 @@ import {
 
 import { IContractsContext, getProviders } from './contractContextProviders';
 
-interface ContractsConfig {
+export interface ContractsConfig {
   address: string | undefined;
   getCosmWasmClient: () => Promise<CosmWasmClient>;
   getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;
diff --git a/packages/ts-codegen/src/plugins/provider-bundle.ts b/packages/ts-codegen/src/plugins/provider-bundle.ts
index 7be51f1f..c99fa255 100644
--- a/packages/ts-codegen/src/plugins/provider-bundle.ts
+++ b/packages/ts-codegen/src/plugins/provider-bundle.ts
@@ -42,7 +42,7 @@ export class ContractsProviderBundlePlugin extends BuilderPluginBase<TSBuilderOp
 
     const providerInfos = context.getProviderInfos();
 
-    if (!Object.keys(providerInfos)?.length) {
+    if (!Object.keys(providerInfos || {})?.length) {
       return;
     }
 
diff --git a/packages/ts-codegen/src/plugins/provider.ts b/packages/ts-codegen/src/plugins/provider.ts
index e7bacaf7..db26109e 100644
--- a/packages/ts-codegen/src/plugins/provider.ts
+++ b/packages/ts-codegen/src/plugins/provider.ts
@@ -45,7 +45,7 @@ export class ContractsContextProviderPlugin extends BuilderPluginBase<TSBuilderO
 
     const providerInfo = context.getProviderInfos()[name];
 
-    if (!Object.keys(providerInfo)?.length) {
+    if (!Object.keys(providerInfo || {})?.length) {
       return;
     }
 
diff --git a/packages/ts-codegen/types/src/builder/builder.d.ts b/packages/ts-codegen/types/src/builder/builder.d.ts
index 97312696..d193445b 100644
--- a/packages/ts-codegen/types/src/builder/builder.d.ts
+++ b/packages/ts-codegen/types/src/builder/builder.d.ts
@@ -15,7 +15,7 @@ export interface BundleOptions {
 export interface UseContractsOptions {
     enabled?: boolean;
 }
-export type TSBuilderOptions = {
+export declare type TSBuilderOptions = {
     bundle?: BundleOptions;
     /**
      * Enable using shorthand constructor.
@@ -24,7 +24,7 @@ export type TSBuilderOptions = {
     useShorthandCtor?: boolean;
     useContractsHooks?: UseContractsOptions;
 } & RenderOptions;
-export type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
+export declare type BuilderFileType = 'type' | 'client' | 'recoil' | 'react-query' | 'message-composer' | 'message-builder' | 'plugin';
 export interface BuilderFile {
     type: BuilderFileType;
     pluginType?: string;
diff --git a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
index 43829a27..5e9f80e1 100644
--- a/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
+++ b/packages/ts-codegen/types/src/helpers/contractsContextTSX.d.ts
@@ -1 +1 @@
-export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\ninterface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
+export declare const contractsContextTSX = "\nimport React, { useEffect, useMemo, useRef, useState, useContext } from 'react';\nimport {\n  CosmWasmClient,\n  SigningCosmWasmClient,\n} from '@cosmjs/cosmwasm-stargate';\n\nimport { IContractsContext, getProviders } from './contractContextProviders';\n\nexport interface ContractsConfig {\n  address: string | undefined;\n  getCosmWasmClient: () => Promise<CosmWasmClient>;\n  getSigningCosmWasmClient: () => Promise<SigningCosmWasmClient>;\n}\n\nconst ContractsContext = React.createContext<IContractsContext | null>(null);\n\nexport const ContractsProvider = ({\n  children,\n  contractsConfig,\n}: {\n  children: React.ReactNode;\n  contractsConfig: ContractsConfig;\n}) => {\n  const [cosmWasmClient, setCosmWasmClient] = useState<CosmWasmClient>();\n  const [signingCosmWasmClient, setSigningCosmWasmClient] =\n    useState<SigningCosmWasmClient>();\n\n  const { address, getCosmWasmClient, getSigningCosmWasmClient } =\n    contractsConfig;\n\n  const prevAddressRef = useRef<string | undefined>(address);\n\n  const contracts: IContractsContext = useMemo(() => {\n    return getProviders(address, cosmWasmClient, signingCosmWasmClient);\n  }, [address, cosmWasmClient, signingCosmWasmClient]);\n\n  useEffect(() => {\n    const connectSigningCwClient = async () => {\n      if (address && prevAddressRef.current !== address) {\n        const signingCosmWasmClient = await getSigningCosmWasmClient();\n        setSigningCosmWasmClient(signingCosmWasmClient);\n      } else if (!address) {\n        setSigningCosmWasmClient(undefined);\n      }\n      prevAddressRef.current = address;\n    };\n    connectSigningCwClient();\n  }, [address, getSigningCosmWasmClient]);\n\n  useEffect(() => {\n    const connectCosmWasmClient = async () => {\n      const cosmWasmClient = await getCosmWasmClient();\n      setCosmWasmClient(cosmWasmClient);\n    };\n    connectCosmWasmClient();\n  }, [getCosmWasmClient]);\n\n  return (\n    <ContractsContext.Provider value={contracts}>\n      {children}\n    </ContractsContext.Provider>\n  );\n};\n\nexport const useContracts = () => {\n  const contracts: IContractsContext = useContext(ContractsContext);\n  if (contracts === null) {\n    throw new Error('useContracts must be used within a ContractsProvider');\n  }\n  return contracts;\n};\n";
diff --git a/packages/wasm-ast-types/types/context/imports.d.ts b/packages/wasm-ast-types/types/context/imports.d.ts
index 21361af1..55ca6708 100644
--- a/packages/wasm-ast-types/types/context/imports.d.ts
+++ b/packages/wasm-ast-types/types/context/imports.d.ts
@@ -5,8 +5,8 @@ export interface ImportObj {
     path: string;
     importAs?: string;
 }
-export type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
-export type UtilMapping = {
+export declare type GetUtilFn = (<TContext = RenderContext>(...args: any[]) => (context: TContext) => ImportObj);
+export declare type UtilMapping = {
     [key: string]: ImportObj | string | GetUtilFn;
 };
 export declare const UTILS: {