diff --git a/sdk/src/dataMapper/AttestationDataMapper.ts b/sdk/src/dataMapper/AttestationDataMapper.ts
index 0d917165..5ede1579 100644
--- a/sdk/src/dataMapper/AttestationDataMapper.ts
+++ b/sdk/src/dataMapper/AttestationDataMapper.ts
@@ -3,9 +3,10 @@ import { abiAttestationRegistry } from "../abi/AttestationRegistry";
 import { Attestation, AttestationPayload } from "../types";
 import { Attestation_filter, Attestation_orderBy } from "../../.graphclient";
 import { Constants } from "../utils/constants";
-import { handleError } from "../utils/errorHandler";
-import { Address, Hash } from "viem";
+import { handleSimulationError } from "../utils/simulationErrorHandler";
+import { Address } from "viem";
 import { encode } from "../utils/abiCoder";
+import { executeTransaction } from "../utils/transactionSender";
 
 export default class AttestationDataMapper extends BaseDataMapper<
   Attestation,
@@ -44,12 +45,12 @@ export default class AttestationDataMapper extends BaseDataMapper<
   }
 
   async simulateUpdateRouter(routerAddress: Address) {
-    return await this.simulateContract("updateRouter", [routerAddress]);
+    return this.simulateContract("updateRouter", [routerAddress]);
   }
 
   async updateRouter(routerAddress: Address) {
     const request = await this.simulateUpdateRouter(routerAddress);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateMassImport(portalAddress: Address, attestationPayloads: AttestationPayload[]) {
@@ -67,53 +68,53 @@ export default class AttestationDataMapper extends BaseDataMapper<
       ]);
     }
 
-    return await this.simulateContract("massImport", [attestationPayloadsArg, portalAddress]);
+    return this.simulateContract("massImport", [attestationPayloadsArg, portalAddress]);
   }
 
   async massImport(portalAddress: Address, attestationPayloads: AttestationPayload[]) {
     const request = await this.simulateMassImport(portalAddress, attestationPayloads);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateIncrementVersionNumber() {
-    return await this.simulateContract("incrementVersionNumber", []);
+    return this.simulateContract("incrementVersionNumber", []);
   }
 
   async incrementVersionNumber() {
     const request = await this.simulateIncrementVersionNumber();
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async isRegistered(attestationId: string) {
-    return await this.executeReadMethod("isRegistered", [attestationId]);
+    return this.executeReadMethod("isRegistered", [attestationId]);
   }
 
   async isRevocable(portalId: string) {
-    return await this.executeReadMethod("isRevocable", [portalId]);
+    return this.executeReadMethod("isRevocable", [portalId]);
   }
 
   async getAttestation(attestationId: string) {
-    return await this.executeReadMethod("getAttestation", [attestationId]);
+    return this.executeReadMethod("getAttestation", [attestationId]);
   }
 
   async getVersionNumber() {
-    return await this.executeReadMethod("getVersionNumber", []);
+    return this.executeReadMethod("getVersionNumber", []);
   }
 
   async getAttestationIdCounter() {
-    return await this.executeReadMethod("getAttestationIdCounter", []);
+    return this.executeReadMethod("getAttestationIdCounter", []);
   }
 
   async balanceOf(account: Address, id: number) {
-    return await this.executeReadMethod("balanceOf", [account, id]);
+    return this.executeReadMethod("balanceOf", [account, id]);
   }
 
   async balanceOfBatch(accounts: Address[], ids: number[]) {
-    return await this.executeReadMethod("balanceOfBatch", [accounts, ids]);
+    return this.executeReadMethod("balanceOfBatch", [accounts, ids]);
   }
 
   private async executeReadMethod(functionName: string, args: unknown[]) {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiAttestationRegistry,
       address: this.conf.attestationRegistryAddress,
       functionName,
@@ -133,15 +134,7 @@ export default class AttestationDataMapper extends BaseDataMapper<
 
       return request;
     } catch (err) {
-      handleError(err);
+      handleSimulationError(err);
     }
   }
-
-  // TODO: Use correct type for request
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async executeTransaction(request: any) {
-    const hash: Hash = await this.walletClient.writeContract(request);
-    console.log(`Transaction sent with hash ${hash}`);
-    return hash;
-  }
 }
diff --git a/sdk/src/dataMapper/PortalDataMapper.ts b/sdk/src/dataMapper/PortalDataMapper.ts
index 45e8b8a0..87c187ed 100644
--- a/sdk/src/dataMapper/PortalDataMapper.ts
+++ b/sdk/src/dataMapper/PortalDataMapper.ts
@@ -1,11 +1,12 @@
 import { AttestationPayload, Portal } from "../types";
 import BaseDataMapper from "./BaseDataMapper";
 import { abiDefaultPortal } from "../abi/DefaultPortal";
-import { Address, Hash } from "viem";
+import { Address } from "viem";
 import { encode } from "../utils/abiCoder";
 import { Portal_filter, Portal_orderBy } from "../../.graphclient";
 import { abiPortalRegistry } from "../abi/PortalRegistry";
-import { handleError } from "../utils/errorHandler";
+import { handleSimulationError } from "../utils/simulationErrorHandler";
+import { executeTransaction } from "../utils/transactionSender";
 
 export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filter, Portal_orderBy> {
   typeName = "portal";
@@ -22,7 +23,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
   async simulateAttest(portalAddress: Address, attestationPayload: AttestationPayload, validationPayloads: string[]) {
     const matchingSchema = await this.veraxSdk.schema.findOneById(attestationPayload.schemaId);
     const attestationData = encode(matchingSchema.schema, attestationPayload.attestationData);
-    return await this.simulateContract(portalAddress, "attest", [
+    return this.simulatePortalContract(portalAddress, "attest", [
       [attestationPayload.schemaId, attestationPayload.expirationDate, attestationPayload.subject, attestationData],
       validationPayloads,
     ]);
@@ -30,7 +31,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
 
   async attest(portalAddress: Address, attestationPayload: AttestationPayload, validationPayloads: string[]) {
     const request = await this.simulateAttest(portalAddress, attestationPayload, validationPayloads);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateBulkAttest(
@@ -51,31 +52,30 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
         attestationData,
       ]);
     }
-
-    return await this.simulateContract(portalAddress, "bulkAttest", [attestationPayloadsArg, validationPayloads]);
+    return this.simulatePortalContract(portalAddress, "bulkAttest", [attestationPayloadsArg, validationPayloads]);
   }
 
   async bulkAttest(portalAddress: Address, attestationPayloads: AttestationPayload[], validationPayloads: string[][]) {
     const request = await this.simulateBulkAttest(portalAddress, attestationPayloads, validationPayloads);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateRevoke(portalAddress: Address, attestationId: string) {
-    return await this.simulateContract(portalAddress, "revoke", [attestationId]);
+    return this.simulatePortalContract(portalAddress, "revoke", [attestationId]);
   }
 
   async revoke(portalAddress: Address, attestationId: string) {
     const request = await this.simulateRevoke(portalAddress, attestationId);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateBulkRevoke(portalAddress: Address, attestationIds: string[]) {
-    return await this.simulateContract(portalAddress, "bulkRevoke", [attestationIds]);
+    return this.simulatePortalContract(portalAddress, "bulkRevoke", [attestationIds]);
   }
 
   async bulkRevoke(portalAddress: Address, attestationIds: string[]) {
     const request = await this.simulateBulkRevoke(portalAddress, attestationIds);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateReplace(
@@ -86,7 +86,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
   ) {
     const matchingSchema = await this.veraxSdk.schema.findOneById(attestationPayload.schemaId);
     const attestationData = encode(matchingSchema.schema, attestationPayload.attestationData);
-    return await this.simulateContract(portalAddress, "replace", [
+    return this.simulatePortalContract(portalAddress, "replace", [
       attestationId,
       [attestationPayload.schemaId, attestationPayload.expirationDate, attestationPayload.subject, attestationData],
       validationPayloads,
@@ -100,7 +100,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
     validationPayloads: string[],
   ) {
     const request = await this.simulateReplace(portalAddress, attestationId, attestationPayload, validationPayloads);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateBulkReplace(
@@ -121,7 +121,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
         attestationData,
       ]);
     }
-    return await this.simulateContract(portalAddress, "bulkReplace", [
+    return this.simulatePortalContract(portalAddress, "bulkReplace", [
       attestationIds,
       attestationPayloadsArg,
       validationPayloads,
@@ -140,23 +140,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
       attestationPayloads,
       validationPayloads,
     );
-    return await this.executeTransaction(request);
-  }
-
-  private async simulateContract(portalAddress: Address, functionName: string, args: unknown[]) {
-    try {
-      const { request } = await this.web3Client.simulateContract({
-        address: portalAddress,
-        abi: abiDefaultPortal,
-        functionName,
-        account: this.walletClient.account,
-        args,
-      });
-
-      return request;
-    } catch (err) {
-      handleError(err);
-    }
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateRegister(id: Address, name: string, description: string, isRevocable: boolean, ownerName: string) {
@@ -165,7 +149,7 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
 
   async register(id: Address, name: string, description: string, isRevocable: boolean, ownerName: string) {
     const request = await this.simulateRegister(id, name, description, isRevocable, ownerName);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async simulateDeployDefaultPortal(
@@ -192,19 +176,19 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
     ownerName: string,
   ) {
     const request = await this.simulateDeployDefaultPortal(modules, name, description, isRevocable, ownerName);
-    return await this.executeTransaction(request);
+    return executeTransaction(this.walletClient, request);
   }
 
   async getPortalByAddress(id: Address) {
-    return await this.executePortalRegistryReadMethod("getPortalByAddress", [id]);
+    return this.executePortalRegistryReadMethod("getPortalByAddress", [id]);
   }
 
   async isPortalRegistered(id: Address) {
-    return await this.executePortalRegistryReadMethod("isRegistered", [id]);
+    return this.executePortalRegistryReadMethod("isRegistered", [id]);
   }
 
   private async executePortalRegistryReadMethod(functionName: string, args: unknown[]) {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiPortalRegistry,
       address: this.conf.portalRegistryAddress,
       functionName,
@@ -224,15 +208,23 @@ export default class PortalDataMapper extends BaseDataMapper<Portal, Portal_filt
 
       return request;
     } catch (err) {
-      handleError(err);
+      handleSimulationError(err);
     }
   }
 
-  // TODO: Use correct type for request
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private async executeTransaction(request: any) {
-    const hash: Hash = await this.walletClient.writeContract(request);
-    console.log(`Transaction sent with hash ${hash}`);
-    return hash;
+  private async simulatePortalContract(portalAddress: Address, functionName: string, args: unknown[]) {
+    try {
+      const { request } = await this.web3Client.simulateContract({
+        address: portalAddress,
+        abi: abiDefaultPortal,
+        functionName,
+        account: this.walletClient.account,
+        args,
+      });
+
+      return request;
+    } catch (err) {
+      handleSimulationError(err);
+    }
   }
 }
diff --git a/sdk/src/dataMapper/UtilsDataMapper.ts b/sdk/src/dataMapper/UtilsDataMapper.ts
index 5b34ad8f..93679e25 100644
--- a/sdk/src/dataMapper/UtilsDataMapper.ts
+++ b/sdk/src/dataMapper/UtilsDataMapper.ts
@@ -15,7 +15,7 @@ export default class UtilsDataMapper extends BaseDataMapper<object, unknown, unk
   }`;
 
   async getModulesNumber() {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiModuleRegistry,
       address: this.conf.moduleRegistryAddress,
       functionName: "getModulesNumber",
@@ -23,7 +23,7 @@ export default class UtilsDataMapper extends BaseDataMapper<object, unknown, unk
   }
 
   async getPortalsCount() {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiPortalRegistry,
       address: this.conf.portalRegistryAddress,
       functionName: "getPortalsCount",
@@ -31,7 +31,7 @@ export default class UtilsDataMapper extends BaseDataMapper<object, unknown, unk
   }
 
   async getSchemasNumber() {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiSchemaRegistry,
       address: this.conf.schemaRegistryAddress,
       functionName: "getSchemasNumber",
@@ -39,7 +39,7 @@ export default class UtilsDataMapper extends BaseDataMapper<object, unknown, unk
   }
 
   async getVersionNumber() {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiAttestationRegistry,
       address: this.conf.attestationRegistryAddress,
       functionName: "getVersionNumber",
@@ -47,7 +47,7 @@ export default class UtilsDataMapper extends BaseDataMapper<object, unknown, unk
   }
 
   async getAttestationIdCounter() {
-    return await this.web3Client.readContract({
+    return this.web3Client.readContract({
       abi: abiAttestationRegistry,
       address: this.conf.attestationRegistryAddress,
       functionName: "getAttestationIdCounter",
diff --git a/sdk/src/utils/errorHandler.ts b/sdk/src/utils/simulationErrorHandler.ts
similarity index 81%
rename from sdk/src/utils/errorHandler.ts
rename to sdk/src/utils/simulationErrorHandler.ts
index 147880af..1e0084a0 100644
--- a/sdk/src/utils/errorHandler.ts
+++ b/sdk/src/utils/simulationErrorHandler.ts
@@ -1,14 +1,15 @@
 import { BaseError, ContractFunctionRevertedError } from "viem";
 
-export function handleError(err: unknown): never {
+export function handleSimulationError(err: unknown): never {
   if (err instanceof BaseError) {
     const revertError = err.walk((err) => err instanceof ContractFunctionRevertedError);
     if (revertError instanceof ContractFunctionRevertedError) {
       const errorName = revertError.data?.errorName ?? "";
       console.error(`Failing with ${errorName}`);
     }
+  } else {
+    console.error(err);
   }
-  console.error(err);
 
   throw new Error("Simulation failed");
 }
diff --git a/sdk/src/utils/transactionSender.ts b/sdk/src/utils/transactionSender.ts
new file mode 100644
index 00000000..ca20401b
--- /dev/null
+++ b/sdk/src/utils/transactionSender.ts
@@ -0,0 +1,9 @@
+import { Hash, WalletClient } from "viem";
+
+// TODO: Use correct type for request
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function executeTransaction(walletClient: WalletClient, request: any): Promise<Hash> {
+  const hash: Hash = await walletClient.writeContract(request);
+  console.log(`Transaction sent with hash ${hash}`);
+  return hash;
+}