diff --git a/packages/cryptography/package.json b/packages/cryptography/package.json
index 84343c4876..c6efb22103 100644
--- a/packages/cryptography/package.json
+++ b/packages/cryptography/package.json
@@ -3,7 +3,6 @@
     "version": "1.6.0-beta.1",
     "description": "Cryptographic utilities and primitives for the Hiero SDK",
     "main": "./lib/index.cjs",
-    "types": "./lib/index.d.ts",
     "module": "./src/index.js",
     "react-native": {
         "./lib/index.cjs": "./src/index.native.js",
@@ -29,7 +28,8 @@
         "./package.json": "./package.json",
         ".": {
             "import": "./src/index.js",
-            "require": "./lib/index.cjs"
+            "require": "./lib/index.cjs",
+            "types": "./lib/index.d.ts"
         }
     },
     "license": "Apache-2.0",
diff --git a/packages/cryptography/src/BadKeyError.js b/packages/cryptography/src/BadKeyError.js
index c0d71bb29c..7b1e443234 100644
--- a/packages/cryptography/src/BadKeyError.js
+++ b/packages/cryptography/src/BadKeyError.js
@@ -13,11 +13,11 @@ export default class BadKeyError extends Error {
         );
 
         this.name = "BadKeyError";
-
+        this.stack = "";
         if (messageOrCause instanceof Error) {
             /** @type {Error=} */
             this.cause = messageOrCause;
-            this.stack = messageOrCause.stack;
+            this.stack = messageOrCause.stack || this.stack || "";
         }
     }
 }
diff --git a/src/BadEntityIdError.js b/src/BadEntityIdError.js
index bcec321c21..3608b81b41 100644
--- a/src/BadEntityIdError.js
+++ b/src/BadEntityIdError.js
@@ -1,5 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
+/**
+ * @typedef {import("long").default} Long
+ */
+
 export default class BadEntityIdError extends Error {
     /**
      * @param {Long} shard
diff --git a/src/EthereumFlow.js b/src/EthereumFlow.js
index 2e56f62b1a..d42be3ae95 100644
--- a/src/EthereumFlow.js
+++ b/src/EthereumFlow.js
@@ -28,7 +28,7 @@ import * as hex from "./encoding/hex.js";
  * @typedef {import("./Timestamp.js").default} Timestamp
  * @typedef {import("./transaction/TransactionId.js").default} TransactionId
  * @typedef {import("./transaction/TransactionResponse.js").default} TransactionResponse
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/EthereumTransaction.js b/src/EthereumTransaction.js
index 5f4e72d603..08fea35f93 100644
--- a/src/EthereumTransaction.js
+++ b/src/EthereumTransaction.js
@@ -24,7 +24,7 @@ import Transaction, {
  * @typedef {import("./client/Client.js").default<*, *>} Client
  * @typedef {import("./Timestamp.js").default} Timestamp
  * @typedef {import("./transaction/TransactionId.js").default} TransactionId
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/Hbar.js b/src/Hbar.js
index 8310179f7e..4732c4bbf7 100644
--- a/src/Hbar.js
+++ b/src/Hbar.js
@@ -1,22 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import { valueToLong } from "./long.js";
 import HbarUnit from "./HbarUnit.js";
 
 import Long from "long";
 
-/**
- * @typedef {import("./long.js").LongObject} LongObject
- */
-
 /**
  * Represents a quantity of hbar (ℏ), the native currency of the Hedera network.
  * Provides utilities for handling different hbar denominations and conversions.
  */
 export default class Hbar {
     /**
-     * @param {number | string | Long | LongObject | BigNumber} amount
+     * @param {number | string | Long | BigNumber} amount
      * @param {HbarUnit=} unit
      */
     constructor(amount, unit = HbarUnit.Hbar) {
diff --git a/src/HbarUnit.js b/src/HbarUnit.js
index a777552fb9..340fec9c20 100644
--- a/src/HbarUnit.js
+++ b/src/HbarUnit.js
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 
 /**
  * Represents a unit of HBAR currency measurement in the Hedera network.
diff --git a/src/RecordStatusError.js b/src/RecordStatusError.js
index 4c4fdc8a77..6197fa9820 100644
--- a/src/RecordStatusError.js
+++ b/src/RecordStatusError.js
@@ -5,7 +5,7 @@ import StatusError from "./StatusError.js";
 /**
  * @typedef {import("./Status.js").default} Status
  * @typedef {import("./transaction/TransactionId.js").default} TransactionId
- * @typedef {import("./transaction/TransactionRecord").default} TransactionRecord
+ * @typedef {import("./transaction/TransactionRecord.js").default} TransactionRecord
  */
 
 export default class RecordStatusError extends StatusError {
diff --git a/src/StakingInfo.js b/src/StakingInfo.js
index 3a21cb025b..8a0e9bd8cf 100644
--- a/src/StakingInfo.js
+++ b/src/StakingInfo.js
@@ -6,7 +6,7 @@ import Timestamp from "./Timestamp.js";
 import * as HieroProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/Transfer.js b/src/Transfer.js
index 301cccb028..35f9e0176c 100644
--- a/src/Transfer.js
+++ b/src/Transfer.js
@@ -18,7 +18,7 @@ import Hbar from "./Hbar.js";
 
 /**
  * @typedef {import("bignumber.js").default} BigNumber
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/account/AccountAllowanceAdjustTransaction.js b/src/account/AccountAllowanceAdjustTransaction.js
index 92385b8433..9b82af915b 100644
--- a/src/account/AccountAllowanceAdjustTransaction.js
+++ b/src/account/AccountAllowanceAdjustTransaction.js
@@ -28,7 +28,6 @@ import * as util from "../util.js";
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("bignumber.js").default} BigNumber
- * @typedef {import("../long.js").LongObject} LongObject
  */
 
 /**
@@ -77,7 +76,7 @@ export default class AccountAllowanceAdjustTransaction extends Transaction {
     /**
      * @deprecated
      * @param {AccountId | string} spenderAccountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long | BigNumber | Hbar} amount
      * @returns {AccountAllowanceAdjustTransaction}
      */
     addHbarAllowance(spenderAccountId, amount) {
@@ -131,7 +130,7 @@ export default class AccountAllowanceAdjustTransaction extends Transaction {
      * @deprecated
      * @param {AccountId | string} ownerAccountId
      * @param {AccountId | string} spenderAccountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long | BigNumber | Hbar} amount
      * @returns {AccountAllowanceAdjustTransaction}
      */
     grantHbarAllowance(ownerAccountId, spenderAccountId, amount) {
@@ -147,7 +146,7 @@ export default class AccountAllowanceAdjustTransaction extends Transaction {
      * @deprecated
      * @param {AccountId | string} ownerAccountId
      * @param {AccountId | string} spenderAccountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long  | BigNumber | Hbar} amount
      * @returns {AccountAllowanceAdjustTransaction}
      */
     revokeHbarAllowance(ownerAccountId, spenderAccountId, amount) {
diff --git a/src/account/AccountAllowanceApproveTransaction.js b/src/account/AccountAllowanceApproveTransaction.js
index 2f539ad161..091301b605 100644
--- a/src/account/AccountAllowanceApproveTransaction.js
+++ b/src/account/AccountAllowanceApproveTransaction.js
@@ -30,7 +30,6 @@ import TokenNftAllowance from "./TokenNftAllowance.js";
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("bignumber.js").default} BigNumber
- * @typedef {import("../long.js").LongObject} LongObject
  */
 
 /**
@@ -123,7 +122,7 @@ export default class AccountAllowanceApproveTransaction extends Transaction {
     /**
      * @param {AccountId | string} ownerAccountId
      * @param {AccountId | ContractId | string} spenderAccountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long | BigNumber | Hbar} amount
      * @returns {AccountAllowanceApproveTransaction}
      */
     approveHbarAllowance(ownerAccountId, spenderAccountId, amount) {
@@ -161,7 +160,7 @@ export default class AccountAllowanceApproveTransaction extends Transaction {
     /**
      * @deprecated - Use `approveHbarAllowance()` instead
      * @param {AccountId | string} spenderAccountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long | BigNumber | Hbar} amount
      * @returns {AccountAllowanceApproveTransaction}
      */
     addHbarAllowance(spenderAccountId, amount) {
diff --git a/src/account/AccountAllowanceDeleteTransaction.js b/src/account/AccountAllowanceDeleteTransaction.js
index c1c1e80993..db76a3806d 100644
--- a/src/account/AccountAllowanceDeleteTransaction.js
+++ b/src/account/AccountAllowanceDeleteTransaction.js
@@ -25,7 +25,6 @@ import TokenNftAllowance from "./TokenNftAllowance.js";
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("bignumber.js").default} BigNumber
- * @typedef {import("../long.js").LongObject} LongObject
  */
 
 /**
diff --git a/src/account/AccountId.js b/src/account/AccountId.js
index 0ade828ceb..1f67b68a37 100644
--- a/src/account/AccountId.js
+++ b/src/account/AccountId.js
@@ -19,7 +19,7 @@ import { isLongZeroAddress } from "../util.js";
  */
 export default class AccountId {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      * @param {(PublicKey)=} aliasKey
diff --git a/src/account/HbarAllowance.js b/src/account/HbarAllowance.js
index 5d6d4333e0..2ac39f7637 100644
--- a/src/account/HbarAllowance.js
+++ b/src/account/HbarAllowance.js
@@ -11,7 +11,7 @@ import Hbar from "../Hbar.js";
  */
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/account/HbarTransferMap.js b/src/account/HbarTransferMap.js
index ce05a48c22..dbed9aaf89 100644
--- a/src/account/HbarTransferMap.js
+++ b/src/account/HbarTransferMap.js
@@ -11,7 +11,6 @@ import ObjectMap from "../ObjectMap.js";
  */
 
 /**
- * @typedef {import("../long.js").LongObject} LongObject
  * @typedef {import("bignumber.js").default} BigNumber
  */
 
diff --git a/src/account/LiveHashAddTransaction.js b/src/account/LiveHashAddTransaction.js
index 91cb352d8c..6b7d5ef4df 100644
--- a/src/account/LiveHashAddTransaction.js
+++ b/src/account/LiveHashAddTransaction.js
@@ -23,6 +23,7 @@ import KeyList from "../KeyList.js";
  * @typedef {import("../channel/Channel.js").default} Channel
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/account/TokenBalanceMap.js b/src/account/TokenBalanceMap.js
index b2d268fcbf..87951f268b 100644
--- a/src/account/TokenBalanceMap.js
+++ b/src/account/TokenBalanceMap.js
@@ -10,7 +10,7 @@ import ObjectMap from "../ObjectMap.js";
  */
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/account/TokenRelationshipMap.js b/src/account/TokenRelationshipMap.js
index 90651c68ad..7a6e4229fe 100644
--- a/src/account/TokenRelationshipMap.js
+++ b/src/account/TokenRelationshipMap.js
@@ -11,7 +11,7 @@ import ObjectMap from "../ObjectMap.js";
  */
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/account/TokenTransferAccountMap.js b/src/account/TokenTransferAccountMap.js
index e65cf24625..8ce0942c02 100644
--- a/src/account/TokenTransferAccountMap.js
+++ b/src/account/TokenTransferAccountMap.js
@@ -3,6 +3,10 @@
 import AccountId from "../account/AccountId.js";
 import ObjectMap from "../ObjectMap.js";
 
+/**
+ * @typedef {import("long").default} Long
+ */
+
 /**
  * @augments {ObjectMap<AccountId, Long>}
  */
diff --git a/src/account/TransferTransaction.js b/src/account/TransferTransaction.js
index 082ed97916..16247234f5 100644
--- a/src/account/TransferTransaction.js
+++ b/src/account/TransferTransaction.js
@@ -14,7 +14,6 @@ import NftId from "../token/NftId.js";
 import AbstractTokenTransferTransaction from "../token/AbstractTokenTransferTransaction.js";
 
 /**
- * @typedef {import("../long.js").LongObject} LongObject
  * @typedef {import("bignumber.js").default} BigNumber
  */
 
@@ -167,7 +166,7 @@ export default class TransferTransaction extends AbstractTokenTransferTransactio
     /**
      * @internal
      * @param {AccountId | string} accountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long | BigNumber | Hbar} amount
      * @param {boolean} isApproved
      * @returns {TransferTransaction}
      */
@@ -203,7 +202,7 @@ export default class TransferTransaction extends AbstractTokenTransferTransactio
     /**
      * @internal
      * @param {AccountId | string} accountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long  | BigNumber | Hbar} amount
      * @returns {TransferTransaction}
      */
     addHbarTransfer(accountId, amount) {
@@ -213,7 +212,7 @@ export default class TransferTransaction extends AbstractTokenTransferTransactio
     /**
      * @internal
      * @param {AccountId | string} accountId
-     * @param {number | string | Long | LongObject | BigNumber | Hbar} amount
+     * @param {number | string | Long | BigNumber | Hbar} amount
      * @returns {TransferTransaction}
      */
     addApprovedHbarTransfer(accountId, amount) {
diff --git a/src/address_book/NodeAddress.js b/src/address_book/NodeAddress.js
index 635453b909..faedc8dc6c 100644
--- a/src/address_book/NodeAddress.js
+++ b/src/address_book/NodeAddress.js
@@ -11,7 +11,7 @@ import * as utf8 from "../encoding/utf8.js";
 
 /**
  * @typedef {import("./Endpoint.js").EndPointJson} EndpointJson
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/contract/ContractCreateFlow.js b/src/contract/ContractCreateFlow.js
index f0a933f9bb..282870cf0b 100644
--- a/src/contract/ContractCreateFlow.js
+++ b/src/contract/ContractCreateFlow.js
@@ -28,7 +28,7 @@ import PublicKey from "../PublicKey.js";
 
 /**
  * @typedef {import("bignumber.js").BigNumber} BigNumber
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/contract/ContractFunctionParameters.js b/src/contract/ContractFunctionParameters.js
index 0566076bda..b7b8797809 100644
--- a/src/contract/ContractFunctionParameters.js
+++ b/src/contract/ContractFunctionParameters.js
@@ -7,7 +7,7 @@ import ContractFunctionSelector, {
 import * as utf8 from "../encoding/utf8.js";
 import * as hex from "../encoding/hex.js";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import * as util from "../util.js";
 import { defaultAbiCoder } from "@ethersproject/abi";
 import { arrayify } from "@ethersproject/bytes";
diff --git a/src/contract/ContractFunctionResult.js b/src/contract/ContractFunctionResult.js
index 17993baa15..08c6159f75 100644
--- a/src/contract/ContractFunctionResult.js
+++ b/src/contract/ContractFunctionResult.js
@@ -3,7 +3,7 @@
 import ContractLogInfo from "./ContractLogInfo.js";
 import ContractId from "./ContractId.js";
 import AccountId from "../account/AccountId.js";
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import * as hex from "../encoding/hex.js";
 import * as utf8 from "../encoding/utf8.js";
 import * as util from "../util.js";
diff --git a/src/contract/ContractId.js b/src/contract/ContractId.js
index 2fc5aab1c9..8bfe3252cb 100644
--- a/src/contract/ContractId.js
+++ b/src/contract/ContractId.js
@@ -18,7 +18,7 @@ import { isLongZeroAddress } from "../util.js";
  */
 export default class ContractId extends Key {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      * @param {Uint8Array=} evmAddress
diff --git a/src/contract/DelegateContractId.js b/src/contract/DelegateContractId.js
index 08b142951c..033d58f1e0 100644
--- a/src/contract/DelegateContractId.js
+++ b/src/contract/DelegateContractId.js
@@ -11,7 +11,7 @@ import * as hex from "../encoding/hex.js";
  */
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 
@@ -21,7 +21,7 @@ import * as hex from "../encoding/hex.js";
  */
 export default class DelegateContractId extends ContractId {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      * @param {Uint8Array=} evmAddress
diff --git a/src/file/FileId.js b/src/file/FileId.js
index eda9add899..f2b90b38e6 100644
--- a/src/file/FileId.js
+++ b/src/file/FileId.js
@@ -13,7 +13,7 @@ import Long from "long";
  */
 export default class FileId {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      */
diff --git a/src/logger/Logger.js b/src/logger/Logger.js
index 256fbfc45a..96cb89e03d 100644
--- a/src/logger/Logger.js
+++ b/src/logger/Logger.js
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-import pino from "pino";
+import { pino } from "pino";
 import LogLevel from "./LogLevel.js";
 
 /**
diff --git a/src/long.js b/src/long.js
index 9d0c24a335..a15ffddf20 100644
--- a/src/long.js
+++ b/src/long.js
@@ -1,14 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 
 /**
- * @typedef {{low: number, high: number, unsigned: boolean}} LongObject
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  */
 
 /**
- * @param {Long | number | string | LongObject | BigNumber} value
+ * @param {Long | number | string | BigNumber} value
  * @returns {BigNumber}
  */
 export function valueToLong(value) {
diff --git a/src/node/NodeDeleteTransaction.js b/src/node/NodeDeleteTransaction.js
index 824045f811..146629ed05 100644
--- a/src/node/NodeDeleteTransaction.js
+++ b/src/node/NodeDeleteTransaction.js
@@ -23,6 +23,7 @@ import Transaction, {
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../account/AccountId.js").default} AccountId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/node/NodeUpdateTransaction.js b/src/node/NodeUpdateTransaction.js
index 51e046c8ce..2a9034c2a5 100644
--- a/src/node/NodeUpdateTransaction.js
+++ b/src/node/NodeUpdateTransaction.js
@@ -29,6 +29,7 @@ const SERVICE_ENDPOINTS_MAX_LENGTH = 8;
  * @typedef {import("../channel/Channel.js").default} Channel
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("../client/Client.js").default<*, *>} Client
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/query/MirrorNodeContractQuery.js b/src/query/MirrorNodeContractQuery.js
index edfd60c3b5..371cc33b00 100644
--- a/src/query/MirrorNodeContractQuery.js
+++ b/src/query/MirrorNodeContractQuery.js
@@ -1,10 +1,10 @@
 import ContractFunctionParameters from "../contract/ContractFunctionParameters.js";
 
 /**
- * @typedef {import("../contract/ContractId").default} ContractId
- * @typedef {import("../account/AccountId").default} AccountId
+ * @typedef {import("../contract/ContractId.js").default} ContractId
+ * @typedef {import("../account/AccountId.js").default} AccountId
  * @typedef {import("../client/Client.js").default<*, *>} Client
- *
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/schedule/ScheduleId.js b/src/schedule/ScheduleId.js
index 63013ad212..2153dbb4d4 100644
--- a/src/schedule/ScheduleId.js
+++ b/src/schedule/ScheduleId.js
@@ -4,7 +4,7 @@ import * as entity_id from "../EntityIdHelper.js";
 import * as HieroProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 
@@ -20,7 +20,7 @@ import * as HieroProto from "@hashgraph/proto";
 
 export default class ScheduleId {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      */
diff --git a/src/token/TokenId.js b/src/token/TokenId.js
index 9abf4f0787..ad5b94280b 100644
--- a/src/token/TokenId.js
+++ b/src/token/TokenId.js
@@ -4,7 +4,7 @@ import * as entity_id from "../EntityIdHelper.js";
 import * as HieroProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 
@@ -13,7 +13,7 @@ import * as HieroProto from "@hashgraph/proto";
  */
 export default class TokenId {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      */
diff --git a/src/token/TokenNftsUpdateTransaction.js b/src/token/TokenNftsUpdateTransaction.js
index 30ff841aad..804265837d 100644
--- a/src/token/TokenNftsUpdateTransaction.js
+++ b/src/token/TokenNftsUpdateTransaction.js
@@ -21,6 +21,7 @@ import Transaction, {
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("../account/AccountId.js").default} AccountId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/token/TokenUpdateNftsTransaction.js b/src/token/TokenUpdateNftsTransaction.js
index f9d1dc38e0..136a618fc5 100644
--- a/src/token/TokenUpdateNftsTransaction.js
+++ b/src/token/TokenUpdateNftsTransaction.js
@@ -21,6 +21,7 @@ import Transaction, {
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
  * @typedef {import("../account/AccountId.js").default} AccountId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/token/TokenUpdateTransaction.js b/src/token/TokenUpdateTransaction.js
index 3f67488696..325c4bd388 100644
--- a/src/token/TokenUpdateTransaction.js
+++ b/src/token/TokenUpdateTransaction.js
@@ -26,6 +26,7 @@ import TokenKeyValidation from "./TokenKeyValidation.js";
  * @typedef {import("../channel/Channel.js").default} Channel
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/topic/TopicCreateTransaction.js b/src/topic/TopicCreateTransaction.js
index 10863099b1..07ffaf675a 100644
--- a/src/topic/TopicCreateTransaction.js
+++ b/src/topic/TopicCreateTransaction.js
@@ -24,6 +24,7 @@ import Hbar from "../Hbar.js";
  * @typedef {import("../channel/Channel.js").default} Channel
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/topic/TopicId.js b/src/topic/TopicId.js
index 014510847d..d5eea3dba2 100644
--- a/src/topic/TopicId.js
+++ b/src/topic/TopicId.js
@@ -4,7 +4,7 @@ import * as entity_id from "../EntityIdHelper.js";
 import * as HieroProto from "@hashgraph/proto";
 
 /**
- * @typedef {import("long")} Long
+ * @typedef {import("long").default} Long
  * @typedef {import("../client/Client.js").default<*, *>} Client
  */
 
@@ -13,7 +13,7 @@ import * as HieroProto from "@hashgraph/proto";
  */
 export default class TopicId {
     /**
-     * @param {number | Long | import("../EntityIdHelper").IEntityId} props
+     * @param {number | Long | import("../EntityIdHelper.js").IEntityId} props
      * @param {(number | Long)=} realm
      * @param {(number | Long)=} num
      */
diff --git a/src/topic/TopicMessage.js b/src/topic/TopicMessage.js
index ef2a82faa8..da2732a5e4 100644
--- a/src/topic/TopicMessage.js
+++ b/src/topic/TopicMessage.js
@@ -62,9 +62,7 @@ export default class TopicMessage {
                     : new Uint8Array(),
             sequenceNumber:
                 response.sequenceNumber != null
-                    ? response.sequenceNumber instanceof Long
-                        ? response.sequenceNumber
-                        : Long.fromNumber(response.sequenceNumber)
+                    ? response.sequenceNumber
                     : Long.ZERO,
             initialTransactionId:
                 response.chunkInfo != null &&
diff --git a/src/topic/TopicUpdateTransaction.js b/src/topic/TopicUpdateTransaction.js
index d6d5fa04c4..6a14a7b299 100644
--- a/src/topic/TopicUpdateTransaction.js
+++ b/src/topic/TopicUpdateTransaction.js
@@ -24,6 +24,7 @@ import CustomFixedFee from "../token/CustomFixedFee.js";
  * @typedef {import("../channel/Channel.js").default} Channel
  * @typedef {import("../client/Client.js").default<*, *>} Client
  * @typedef {import("../transaction/TransactionId.js").default} TransactionId
+ * @typedef {import("long").default} Long
  */
 
 /**
diff --git a/src/util.js b/src/util.js
index 91e7611218..ec8fe01e92 100644
--- a/src/util.js
+++ b/src/util.js
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-import BigNumber from "bignumber.js";
+import { BigNumber } from "bignumber.js";
 import Long from "long";
 
 /**
diff --git a/tsconfig.json b/tsconfig.json
index b44beffa8c..27e7c166cb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "compilerOptions": {
         "target": "esnext",
-        "module": "esnext",
+        "module": "Node16",
         "lib": ["ESNext", "DOM"],
         "allowJs": true,
         "checkJs": true,
@@ -16,7 +16,7 @@
         "downlevelIteration": true,
         "noImplicitReturns": true,
         "noFallthroughCasesInSwitch": true,
-        "moduleResolution": "node",
+        "moduleResolution": "Node16",
         "allowSyntheticDefaultImports": true,
         "esModuleInterop": true,
         "forceConsistentCasingInFileNames": true