diff --git a/escrow/free_call_storage.go b/escrow/free_call_storage.go
index 82a61853..44ec3340 100644
--- a/escrow/free_call_storage.go
+++ b/escrow/free_call_storage.go
@@ -13,8 +13,8 @@ type FreeCallUserStorage struct {
 func NewFreeCallUserStorage(atomicStorage storage.AtomicStorage) *FreeCallUserStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/free-call-user/storage")
 	storage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializeFreeCallKey, reflect.TypeOf(FreeCallUserKey{}), serialize, deserialize,
-		reflect.TypeOf(FreeCallUserData{}),
+		prefixedStorage, serializeFreeCallKey, reflect.TypeFor[FreeCallUserKey](), serialize, deserialize,
+		reflect.TypeFor[FreeCallUserData](),
 	)
 	return &FreeCallUserStorage{delegate: storage}
 	/*	return &FreeCallUserStorage{
diff --git a/escrow/payment_channel_storage.go b/escrow/payment_channel_storage.go
index a1a2d4ca..cb4bf67a 100644
--- a/escrow/payment_channel_storage.go
+++ b/escrow/payment_channel_storage.go
@@ -26,8 +26,8 @@ type PaymentChannelStorage struct {
 func NewPaymentChannelStorage(atomicStorage storage.AtomicStorage) *PaymentChannelStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/payment-channel/storage")
 	storage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializeKey, reflect.TypeOf(PaymentChannelKey{}), serialize, deserialize,
-		reflect.TypeOf(PaymentChannelData{}),
+		prefixedStorage, serializeKey, reflect.TypeFor[PaymentChannelKey](), serialize, deserialize,
+		reflect.TypeFor[PaymentChannelData](),
 	)
 	return &PaymentChannelStorage{delegate: storage}
 
diff --git a/escrow/payment_storage.go b/escrow/payment_storage.go
index cac7b9dd..cb4ae37f 100644
--- a/escrow/payment_storage.go
+++ b/escrow/payment_storage.go
@@ -17,8 +17,8 @@ type PaymentStorage struct {
 func NewPaymentStorage(atomicStorage storage.AtomicStorage) *PaymentStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/payment/storage")
 	storage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializeKey, reflect.TypeOf(""), serialize, deserialize,
-		reflect.TypeOf(Payment{}),
+		prefixedStorage, serializeKey, reflect.TypeFor[string](), serialize, deserialize,
+		reflect.TypeFor[Payment](),
 	)
 	return &PaymentStorage{delegate: storage}
 }
diff --git a/escrow/prepaid_storage.go b/escrow/prepaid_storage.go
index 020416b8..a1fe8668 100644
--- a/escrow/prepaid_storage.go
+++ b/escrow/prepaid_storage.go
@@ -90,8 +90,8 @@ func serializePrePaidKey(key any) (serialized string, err error) {
 func NewPrepaidStorage(atomicStorage storage.AtomicStorage) storage.TypedAtomicStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/PrePaid/storage")
 	storage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializePrePaidKey, reflect.TypeOf(PrePaidDataKey{}), serialize, deserialize,
-		reflect.TypeOf(PrePaidData{}),
+		prefixedStorage, serializePrePaidKey, reflect.TypeFor[PrePaidDataKey](), serialize, deserialize,
+		reflect.TypeFor[PrePaidData](),
 	)
 	return storage
 }
diff --git a/license_server/license_storage.go b/license_server/license_storage.go
index e0eb202f..7c7db79c 100644
--- a/license_server/license_storage.go
+++ b/license_server/license_storage.go
@@ -334,10 +334,10 @@ func NewLicenseDetailsStorage(atomicStorage storage.AtomicStorage) storage.Typed
 	return storage.NewTypedAtomicStorageImpl(
 		storage.NewPrefixedAtomicStorage(atomicStorage, "LicenseDetails/storage"),
 		serializeLicenseDetailsKey,
-		reflect.TypeOf(LicenseDetailsKey{}),
+		reflect.TypeFor[LicenseDetailsKey](),
 		serializeLicenseDetailsData,
 		deserializeLicenseDetailsData,
-		reflect.TypeOf(LicenseDetailsData{}))
+		reflect.TypeFor[LicenseDetailsData]())
 }
 
 func serializeLicenseDetailsData(value any) (slice string, err error) {
@@ -396,9 +396,9 @@ func NewLicenseUsageTrackerStorage(atomicStorage storage.AtomicStorage) storage.
 	return storage.NewTypedAtomicStorageImpl(
 		storage.NewPrefixedAtomicStorage(atomicStorage, "LicenseUsageTracker/storage"),
 		serializeLicenseUsageTrackerKey,
-		reflect.TypeOf(LicenseUsageTrackerKey{}),
+		reflect.TypeFor[LicenseUsageTrackerKey](),
 		serializeLicenseTrackerData,
 		deserializeLicenseTrackerData,
-		reflect.TypeOf(LicenseUsageTrackerData{}),
+		reflect.TypeFor[LicenseUsageTrackerData](),
 	)
 }
diff --git a/metrics/utils_test.go b/metrics/utils_test.go
index 91be0e7f..7962d357 100644
--- a/metrics/utils_test.go
+++ b/metrics/utils_test.go
@@ -70,7 +70,7 @@ func TestGetEpochTime(t *testing.T) {
 	currentEpoch := getEpochTime()
 	assert.NotNil(t, currentEpoch, "Epoch must not be empty")
 	assert.NotEqual(t, currentEpoch, 0, "epoch msut not be zero")
-	assert.IsType(t, reflect.TypeOf(types.Int64), reflect.TypeOf(currentEpoch), "Epoch must be an integer")
+	assert.IsType(t, reflect.TypeFor[types.BasicKind](), reflect.TypeFor[int64](), "Epoch must be an integer")
 
 	// two epochs must not be equal
 	time.Sleep(1 * time.Second)
diff --git a/training/storage.go b/training/storage.go
index c2e5c226..f3bae8c5 100644
--- a/training/storage.go
+++ b/training/storage.go
@@ -37,8 +37,8 @@ type PublicModelStorage struct {
 func NewUserModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *ModelUserStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/userModelStorage")
 	userModelStorage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializeModelUserKey, reflect.TypeOf(ModelUserKey{}), utils.Serialize, utils.Deserialize,
-		reflect.TypeOf(ModelUserData{}),
+		prefixedStorage, serializeModelUserKey, reflect.TypeFor[ModelUserKey](), utils.Serialize, utils.Deserialize,
+		reflect.TypeFor[ModelUserData](),
 	)
 	return &ModelUserStorage{delegate: userModelStorage, organizationMetaData: orgMetadata}
 }
@@ -46,8 +46,8 @@ func NewUserModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *block
 func NewModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *ModelStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/modelStorage")
 	modelStorage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializeModelKey, reflect.TypeOf(ModelKey{}), utils.Serialize, utils.Deserialize,
-		reflect.TypeOf(ModelData{}),
+		prefixedStorage, serializeModelKey, reflect.TypeFor[ModelKey](), utils.Serialize, utils.Deserialize,
+		reflect.TypeFor[ModelData](),
 	)
 	return &ModelStorage{delegate: modelStorage, organizationMetaData: orgMetadata}
 }
@@ -55,8 +55,8 @@ func NewModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchai
 func NewPendingModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *PendingModelStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/pendingModelStorage")
 	pendingModelStorage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializePendingModelKey, reflect.TypeOf(PendingModelKey{}), utils.Serialize, utils.Deserialize,
-		reflect.TypeOf(PendingModelData{}),
+		prefixedStorage, serializePendingModelKey, reflect.TypeFor[PendingModelKey](), utils.Serialize, utils.Deserialize,
+		reflect.TypeFor[PendingModelData](),
 	)
 	return &PendingModelStorage{delegate: pendingModelStorage, organizationMetaData: orgMetadata}
 }
@@ -64,8 +64,8 @@ func NewPendingModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *bl
 func NewPublicModelStorage(atomicStorage storage.AtomicStorage, orgMetadata *blockchain.OrganizationMetaData) *PublicModelStorage {
 	prefixedStorage := storage.NewPrefixedAtomicStorage(atomicStorage, "/model-user/publicModelStorage")
 	publicModelStorage := storage.NewTypedAtomicStorageImpl(
-		prefixedStorage, serializePublicModelKey, reflect.TypeOf(PublicModelKey{}), utils.Serialize, utils.Deserialize,
-		reflect.TypeOf(PublicModelData{}),
+		prefixedStorage, serializePublicModelKey, reflect.TypeFor[PublicModelKey](), utils.Serialize, utils.Deserialize,
+		reflect.TypeFor[PublicModelData](),
 	)
 	return &PublicModelStorage{delegate: publicModelStorage, organizationMetaData: orgMetadata}
 }