diff --git a/packages/bcp/src/cosmwasmcodec.ts b/packages/bcp/src/cosmwasmcodec.ts
index 17e8c70a..3d89c589 100644
--- a/packages/bcp/src/cosmwasmcodec.ts
+++ b/packages/bcp/src/cosmwasmcodec.ts
@@ -113,4 +113,5 @@ const defaultTokens: TokenInfos = [
   },
 ];
 
+/** Unconfigured codec is useful for testing only */
 export const cosmWasmCodec = new CosmWasmCodec(defaultPrefix, defaultTokens);
diff --git a/packages/bcp/src/cosmwasmconnector.ts b/packages/bcp/src/cosmwasmconnector.ts
index 9863aa18..295aee0a 100644
--- a/packages/bcp/src/cosmwasmconnector.ts
+++ b/packages/bcp/src/cosmwasmconnector.ts
@@ -1,9 +1,9 @@
 import { ChainConnector, ChainId } from "@iov/bcp";
 
 import { CosmosBech32Prefix } from "./address";
-import { cosmWasmCodec } from "./cosmwasmcodec";
+import { CosmWasmCodec } from "./cosmwasmcodec";
 import { CosmWasmConnection } from "./cosmwasmconnection";
-import { TokenInfos } from "./types";
+import { TokenInfo } from "./types";
 
 /**
  * A helper to connect to a cosmos-based chain at a given url
@@ -11,12 +11,13 @@ import { TokenInfos } from "./types";
 export function createCosmWasmConnector(
   url: string,
   prefix: CosmosBech32Prefix,
-  tokenInfo: TokenInfos,
+  tokenInfo: readonly TokenInfo[],
   expectedChainId?: ChainId,
 ): ChainConnector<CosmWasmConnection> {
+  const codec = new CosmWasmCodec(prefix, tokenInfo);
   return {
     establishConnection: async () => CosmWasmConnection.establish(url, prefix, tokenInfo),
-    codec: cosmWasmCodec,
+    codec: codec,
     expectedChainId: expectedChainId,
   };
 }
diff --git a/packages/bcp/src/index.ts b/packages/bcp/src/index.ts
index 91313392..81e10d6e 100644
--- a/packages/bcp/src/index.ts
+++ b/packages/bcp/src/index.ts
@@ -1,3 +1,4 @@
-export { cosmWasmCodec, CosmWasmCodec } from "./cosmwasmcodec";
+export { CosmWasmCodec } from "./cosmwasmcodec";
 export { CosmWasmConnection } from "./cosmwasmconnection";
 export { createCosmWasmConnector } from "./cosmwasmconnector";
+export { TokenInfo } from "./types";
diff --git a/packages/bcp/types/cosmwasmcodec.d.ts b/packages/bcp/types/cosmwasmcodec.d.ts
index ec1253b0..1373ef99 100644
--- a/packages/bcp/types/cosmwasmcodec.d.ts
+++ b/packages/bcp/types/cosmwasmcodec.d.ts
@@ -23,4 +23,5 @@ export declare class CosmWasmCodec implements TxCodec {
   identityToAddress(identity: Identity): Address;
   isValidAddress(address: string): boolean;
 }
+/** Unconfigured codec is useful for testing only */
 export declare const cosmWasmCodec: CosmWasmCodec;
diff --git a/packages/bcp/types/cosmwasmconnector.d.ts b/packages/bcp/types/cosmwasmconnector.d.ts
index 9e34e052..2a2ba3e7 100644
--- a/packages/bcp/types/cosmwasmconnector.d.ts
+++ b/packages/bcp/types/cosmwasmconnector.d.ts
@@ -1,13 +1,13 @@
 import { ChainConnector, ChainId } from "@iov/bcp";
 import { CosmosBech32Prefix } from "./address";
 import { CosmWasmConnection } from "./cosmwasmconnection";
-import { TokenInfos } from "./types";
+import { TokenInfo } from "./types";
 /**
  * A helper to connect to a cosmos-based chain at a given url
  */
 export declare function createCosmWasmConnector(
   url: string,
   prefix: CosmosBech32Prefix,
-  tokenInfo: TokenInfos,
+  tokenInfo: readonly TokenInfo[],
   expectedChainId?: ChainId,
 ): ChainConnector<CosmWasmConnection>;
diff --git a/packages/bcp/types/index.d.ts b/packages/bcp/types/index.d.ts
index 91313392..81e10d6e 100644
--- a/packages/bcp/types/index.d.ts
+++ b/packages/bcp/types/index.d.ts
@@ -1,3 +1,4 @@
-export { cosmWasmCodec, CosmWasmCodec } from "./cosmwasmcodec";
+export { CosmWasmCodec } from "./cosmwasmcodec";
 export { CosmWasmConnection } from "./cosmwasmconnection";
 export { createCosmWasmConnector } from "./cosmwasmconnector";
+export { TokenInfo } from "./types";