diff --git a/packages/api-contract/src/promise/index.ts b/packages/api-contract/src/promise/index.ts
index a9f7319a9c..49e0369895 100644
--- a/packages/api-contract/src/promise/index.ts
+++ b/packages/api-contract/src/promise/index.ts
@@ -1,10 +1,27 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { toPromiseMethod } from '@polkadot/api';
+import type { AccountId, Hash } from '@polkadot/types/interfaces';
 
-import { extendBlueprint, extendCode, extendContract } from '../base';
+import { ApiPromise, toPromiseMethod } from '@polkadot/api';
 
-export const BlueprintPromise = extendBlueprint<'promise'>('promise', toPromiseMethod);
-export const CodePromise = extendCode<'promise'>('promise', toPromiseMethod);
-export const ContractPromise = extendContract<'promise'>('promise', toPromiseMethod);
+import { Abi } from '../Abi';
+import { Blueprint, Code, Contract } from '../base';
+
+export class BlueprintPromise extends Blueprint<'promise'> {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, codeHash: string | Hash) {
+    super(api, abi, codeHash, toPromiseMethod);
+  }
+}
+
+export class CodePromise extends Code<'promise'> {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
+    super(api, abi, wasm, toPromiseMethod);
+  }
+}
+
+export class ContractPromise extends Contract<'promise'> {
+  constructor (api: ApiPromise, abi: string | Record<string, unknown> | Abi, address: string | AccountId) {
+    super(api, abi, address, toPromiseMethod);
+  }
+}
diff --git a/packages/api-contract/src/rx/index.ts b/packages/api-contract/src/rx/index.ts
index ead8ce00bc..151acd2af6 100644
--- a/packages/api-contract/src/rx/index.ts
+++ b/packages/api-contract/src/rx/index.ts
@@ -1,10 +1,27 @@
 // Copyright 2017-2021 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { toRxMethod } from '@polkadot/api';
+import type { AccountId, Hash } from '@polkadot/types/interfaces';
 
-import { extendBlueprint, extendCode, extendContract } from '../base';
+import { ApiRx, toRxMethod } from '@polkadot/api';
 
-export const BlueprintRx = extendBlueprint<'rxjs'>('rxjs', toRxMethod);
-export const CodeRx = extendCode<'rxjs'>('rxjs', toRxMethod);
-export const ContractRx = extendContract<'rxjs'>('rxjs', toRxMethod);
+import { Abi } from '../Abi';
+import { Blueprint, Code, Contract } from '../base';
+
+export class BlueprintRx extends Blueprint<'rxjs'> {
+  constructor (api: ApiRx, abi: string | Record<string, unknown> | Abi, codeHash: string | Hash) {
+    super(api, abi, codeHash, toRxMethod);
+  }
+}
+
+export class CodeRx extends Code<'rxjs'> {
+  constructor (api: ApiRx, abi: string | Record<string, unknown> | Abi, wasm: Uint8Array | string | Buffer | null | undefined) {
+    super(api, abi, wasm, toRxMethod);
+  }
+}
+
+export class ContractRx extends Contract<'rxjs'> {
+  constructor (api: ApiRx, abi: string | Record<string, unknown> | Abi, address: string | AccountId) {
+    super(api, abi, address, toRxMethod);
+  }
+}