diff --git a/docs/api/classes/modules_signer.SignerService.md b/docs/api/classes/modules_signer.SignerService.md
index f5897ed5..24a17182 100644
--- a/docs/api/classes/modules_signer.SignerService.md
+++ b/docs/api/classes/modules_signer.SignerService.md
@@ -353,14 +353,14 @@ ___
 
 Add event handler for certain events
 
-**`Requires`**
-
-to be called after the connection to wallet was initialized
-
 #### Returns
 
 `void`
 
+**`Requires`**
+
+to be called after the connection to wallet was initialized
+
 ___
 
 ### on
diff --git a/docs/api/classes/modules_staking.StakingFactoryService.md b/docs/api/classes/modules_staking.StakingFactoryService.md
index c99d9dc1..0bfd489f 100644
--- a/docs/api/classes/modules_staking.StakingFactoryService.md
+++ b/docs/api/classes/modules_staking.StakingFactoryService.md
@@ -35,28 +35,28 @@ Intended for staking pool
 
 ▸ **allServices**(): `Promise`<[`Service`](../modules/modules_staking.md#service)[]\>
 
-**`Description`**
-
-Returns all services for which pools are launched
-
 #### Returns
 
 `Promise`<[`Service`](../modules/modules_staking.md#service)[]\>
 
+**`Description`**
+
+Returns all services for which pools are launched
+
 ___
 
 ### getPool
 
 ▸ **getPool**(): `Promise`<[`StakingPoolService`](modules_staking.StakingPoolService.md)\>
 
-**`Description`**
-
-Returns pool launched for energyweb org
-
 #### Returns
 
 `Promise`<[`StakingPoolService`](modules_staking.StakingPoolService.md)\>
 
+**`Description`**
+
+Returns pool launched for energyweb org
+
 ___
 
 ### create
diff --git a/docs/api/classes/modules_staking.StakingPoolService.md b/docs/api/classes/modules_staking.StakingPoolService.md
index 008ba397..7b3b1271 100644
--- a/docs/api/classes/modules_staking.StakingPoolService.md
+++ b/docs/api/classes/modules_staking.StakingPoolService.md
@@ -127,8 +127,6 @@ ___
 
 ▸ **partialWithdraw**(`value`): `Promise`<`ContractReceipt`\>
 
-**`Description`**
-
 #### Parameters
 
 | Name | Type |
@@ -139,20 +137,14 @@ ___
 
 `Promise`<`ContractReceipt`\>
 
+**`Description`**
+
 ___
 
 ### putStake
 
 ▸ **putStake**(`stake`): `Promise`<`void`\>
 
-**`Description`**
-
-Locks stake and starts accumulating reward
-
-**`Emits`**
-
-StakingPool.StakePut
-
 #### Parameters
 
 | Name | Type |
@@ -163,16 +155,24 @@ StakingPool.StakePut
 
 `Promise`<`void`\>
 
+**`Description`**
+
+Locks stake and starts accumulating reward
+
+**`Emits`**
+
+StakingPool.StakePut
+
 ___
 
 ### withdraw
 
 ▸ **withdraw**(): `Promise`<`void`\>
 
-**`Description`**
-
-pays back stake with accumulated reward.
-
 #### Returns
 
 `Promise`<`void`\>
+
+**`Description`**
+
+pays back stake with accumulated reward.
diff --git a/docs/api/classes/modules_verifiable_credentials.VerifiableCredentialsServiceBase.md b/docs/api/classes/modules_verifiable_credentials.VerifiableCredentialsServiceBase.md
index debd6e02..767b7845 100644
--- a/docs/api/classes/modules_verifiable_credentials.VerifiableCredentialsServiceBase.md
+++ b/docs/api/classes/modules_verifiable_credentials.VerifiableCredentialsServiceBase.md
@@ -50,10 +50,6 @@ verifiableCredentialsService.createRoleVC(...);
 
 ▸ **continueExchange**(`«destructured»`): `Promise`<`undefined` \| `VerifiablePresentation` \| `VpRequest`\>
 
-**`Description`**
-
-Sends credentials requested by issuer and returns either issued credentials or next credentials request
-
 #### Parameters
 
 | Name | Type |
@@ -66,6 +62,10 @@ Sends credentials requested by issuer and returns either issued credentials or n
 
 issued credentials or request of additional credentials
 
+**`Description`**
+
+Sends credentials requested by issuer and returns either issued credentials or next credentials request
+
 ___
 
 ### createCredential
diff --git a/docs/api/interfaces/modules_claims.Claim.md b/docs/api/interfaces/modules_claims.Claim.md
index ed7f2a7c..d1aa4199 100644
--- a/docs/api/interfaces/modules_claims.Claim.md
+++ b/docs/api/interfaces/modules_claims.Claim.md
@@ -60,7 +60,7 @@ ___
 
 ### expirationTimestamp
 
-• `Optional` **expirationTimestamp**: `string`
+• `Optional` **expirationTimestamp**: `number`
 
 ___
 
diff --git a/docs/api/modules/modules_signer.md b/docs/api/modules/modules_signer.md
index 43d75f97..b2616804 100644
--- a/docs/api/modules/modules_signer.md
+++ b/docs/api/modules/modules_signer.md
@@ -106,11 +106,6 @@ ___
 
 ▸ **fromGnosis**(`safeAppSdk`): `Promise`<[`SignerService`](../classes/modules_signer.SignerService.md)\>
 
-**`Description`**
-
-Intended for use in Volta Gnosis web interface(https://volta.gnosis-safe.io/).
-Dapp should provide SafeAppSdk injected by Gnosis interface
-
 #### Parameters
 
 | Name | Type |
@@ -121,6 +116,11 @@ Dapp should provide SafeAppSdk injected by Gnosis interface
 
 `Promise`<[`SignerService`](../classes/modules_signer.SignerService.md)\>
 
+**`Description`**
+
+Intended for use in Volta Gnosis web interface(https://volta.gnosis-safe.io/).
+Dapp should provide SafeAppSdk injected by Gnosis interface
+
 ___
 
 ### fromKms
diff --git a/src/modules/claims/claims.service.ts b/src/modules/claims/claims.service.ts
index f31d2ff8..1d68a4c3 100644
--- a/src/modules/claims/claims.service.ts
+++ b/src/modules/claims/claims.service.ts
@@ -793,7 +793,7 @@ export class ClaimsService {
         throw new Error(ERROR_MESSAGES.PUBLISH_NOT_ISSUED_CLAIM);
       }
       const expirationTimestamp = claimDataForClaimType.expirationTimestamp
-        ? Math.floor(+claimDataForClaimType.expirationTimestamp / 1000)
+        ? Math.floor(claimDataForClaimType.expirationTimestamp / 1000)
         : undefined;
 
       await this.registerOnchain({
diff --git a/src/modules/claims/claims.types.ts b/src/modules/claims/claims.types.ts
index cd10ee35..58405356 100644
--- a/src/modules/claims/claims.types.ts
+++ b/src/modules/claims/claims.types.ts
@@ -69,7 +69,7 @@ export interface Claim {
   createdAt: string;
   redirectUri?: string;
   vp?: VerifiablePresentation;
-  expirationTimestamp?: string;
+  expirationTimestamp?: number;
 }
 
 export const readyToBeRegisteredOnchain = (