diff --git a/docs/classes/ASBTContract.md b/docs/classes/ASBTContract.md
index 8429b71e..f73918d1 100644
--- a/docs/classes/ASBTContract.md
+++ b/docs/classes/ASBTContract.md
@@ -81,7 +81,7 @@ MasaSBTModuleBase.masa
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTAuthority`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTAuthority` |
 
 #### Parameters
 
@@ -128,7 +128,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTAuthority`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTAuthority` |
 
 #### Parameters
 
@@ -250,7 +250,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/ASBTContractWrapper.md b/docs/classes/ASBTContractWrapper.md
index 818cb025..d27880aa 100644
--- a/docs/classes/ASBTContractWrapper.md
+++ b/docs/classes/ASBTContractWrapper.md
@@ -52,7 +52,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTAuthority`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTAuthority` |
 
 #### Parameters
 
@@ -268,7 +268,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/CreditScore.md b/docs/classes/CreditScore.md
index 94ee13f7..42da968a 100644
--- a/docs/classes/CreditScore.md
+++ b/docs/classes/CreditScore.md
@@ -255,7 +255,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/Green.md b/docs/classes/Green.md
index ef404122..b44411e6 100644
--- a/docs/classes/Green.md
+++ b/docs/classes/Green.md
@@ -255,7 +255,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/Identity.md b/docs/classes/Identity.md
index 6c4d4966..455a25e2 100644
--- a/docs/classes/Identity.md
+++ b/docs/classes/Identity.md
@@ -222,7 +222,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/MasaASBT.md b/docs/classes/MasaASBT.md
index e56bc103..2513c126 100644
--- a/docs/classes/MasaASBT.md
+++ b/docs/classes/MasaASBT.md
@@ -61,7 +61,7 @@ MasaBase.masa
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTAuthority`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTAuthority` |
 
 #### Parameters
 
@@ -83,7 +83,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTAuthority`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTAuthority` |
 
 #### Parameters
 
diff --git a/docs/classes/MasaASBTWrapper.md b/docs/classes/MasaASBTWrapper.md
index 4931c455..8a9f11dc 100644
--- a/docs/classes/MasaASBTWrapper.md
+++ b/docs/classes/MasaASBTWrapper.md
@@ -46,7 +46,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTAuthority`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTAuthority` |
 
 #### Parameters
 
diff --git a/docs/classes/MasaSBTBase.md b/docs/classes/MasaSBTBase.md
index 85d6d673..45cfd97a 100644
--- a/docs/classes/MasaSBTBase.md
+++ b/docs/classes/MasaSBTBase.md
@@ -60,7 +60,7 @@ MasaBase.masa
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
@@ -82,7 +82,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/MasaSBTWrapper.md b/docs/classes/MasaSBTWrapper.md
index 134b2613..bc4adf83 100644
--- a/docs/classes/MasaSBTWrapper.md
+++ b/docs/classes/MasaSBTWrapper.md
@@ -48,7 +48,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/MasaSSSBT.md b/docs/classes/MasaSSSBT.md
index 7f20cb52..a34028e6 100644
--- a/docs/classes/MasaSSSBT.md
+++ b/docs/classes/MasaSSSBT.md
@@ -61,7 +61,7 @@ MasaBase.masa
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTSelfSovereign`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTSelfSovereign` |
 
 #### Parameters
 
@@ -83,7 +83,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTSelfSovereign`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTSelfSovereign` |
 
 #### Parameters
 
diff --git a/docs/classes/MasaSSSBTWrapper.md b/docs/classes/MasaSSSBTWrapper.md
index d794a0ca..5f74f88c 100644
--- a/docs/classes/MasaSSSBTWrapper.md
+++ b/docs/classes/MasaSSSBTWrapper.md
@@ -46,7 +46,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTSelfSovereign`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTSelfSovereign` |
 
 #### Parameters
 
diff --git a/docs/classes/SBTContract.md b/docs/classes/SBTContract.md
index b503a412..8e7e5bba 100644
--- a/docs/classes/SBTContract.md
+++ b/docs/classes/SBTContract.md
@@ -81,7 +81,7 @@ MasaSBTModuleBase.masa
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
@@ -130,7 +130,7 @@ loads an sbt instance and connects the contract functions to it
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
@@ -252,7 +252,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/SBTContractWrapper.md b/docs/classes/SBTContractWrapper.md
index e096b1d1..8fd227da 100644
--- a/docs/classes/SBTContractWrapper.md
+++ b/docs/classes/SBTContractWrapper.md
@@ -54,7 +54,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
@@ -245,7 +245,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/SSSBTContract.md b/docs/classes/SSSBTContract.md
index 33207807..e1b24067 100644
--- a/docs/classes/SSSBTContract.md
+++ b/docs/classes/SSSBTContract.md
@@ -81,7 +81,7 @@ MasaSBTModuleBase.masa
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTSelfSovereign`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTSelfSovereign` |
 
 #### Parameters
 
@@ -128,7 +128,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTSelfSovereign`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTSelfSovereign` |
 
 #### Parameters
 
@@ -250,7 +250,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/classes/SSSBTContractWrapper.md b/docs/classes/SSSBTContractWrapper.md
index a8f32f7e..1c42d129 100644
--- a/docs/classes/SSSBTContractWrapper.md
+++ b/docs/classes/SSSBTContractWrapper.md
@@ -53,7 +53,7 @@
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `ReferenceSBTSelfSovereign`<`Contract`\> |
+| `Contract` | extends `ReferenceSBTSelfSovereign` |
 
 #### Parameters
 
@@ -252,7 +252,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `Contract` | extends `MasaSBT`<`Contract`\> |
+| `Contract` | extends `MasaSBT` |
 
 #### Parameters
 
diff --git a/docs/interfaces/ERC20.md b/docs/interfaces/ERC20.md
index e0c8870d..36ad13bf 100644
--- a/docs/interfaces/ERC20.md
+++ b/docs/interfaces/ERC20.md
@@ -611,7 +611,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `TEvent` | extends `TypedEvent`<`any`, `any`, `TEvent`\> |
+| `TEvent` | extends `TypedEvent`<`any`, `any`\> |
 
 #### Parameters
 
@@ -669,7 +669,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `TEvent` | extends `TypedEvent`<`any`, `any`, `TEvent`\> |
+| `TEvent` | extends `TypedEvent`<`any`, `any`\> |
 
 #### Parameters
 
@@ -697,7 +697,7 @@ ___
 
 | Name | Type |
 | :------ | :------ |
-| `TEvent` | extends `TypedEvent`<`any`, `any`, `TEvent`\> |
+| `TEvent` | extends `TypedEvent`<`any`, `any`\> |
 
 #### Parameters