diff --git a/.changeset/sour-poems-stop.md b/.changeset/sour-poems-stop.md
new file mode 100644
index 000000000..cbb5d62e9
--- /dev/null
+++ b/.changeset/sour-poems-stop.md
@@ -0,0 +1,5 @@
+---
+'@openzeppelin/wizard': patch
+---
+
+Add missing imports for modular accounts without a signer
diff --git a/packages/core/solidity/src/account.test.ts.md b/packages/core/solidity/src/account.test.ts.md
index 1ea211d9d..96e575467 100644
--- a/packages/core/solidity/src/account.test.ts.md
+++ b/packages/core/solidity/src/account.test.ts.md
@@ -100,8 +100,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountERC721Holder is Account, EIP712, ERC7739, ERC721Holder {␊
@@ -128,8 +128,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountERC1155Holder is Account, EIP712, ERC7739, ERC1155Holder {␊
@@ -156,9 +156,9 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder {␊
@@ -185,9 +185,9 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, ERC7821 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -223,12 +223,13 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579 {␊
-        constructor(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        constructor(uint256 moduleTypeId, address module, bytes memory initData)␊
             EIP712("MyAccount", "1")␊
         {␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
@@ -271,9 +272,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579 {␊
-        constructor(uint256 moduleTypeId, address module, bytes calldata initData) {␊
+        constructor(uint256 moduleTypeId, address module, bytes memory initData) {␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
             _installModule(moduleTypeId, module, initData);␊
         }␊
@@ -309,12 +311,13 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579 {␊
-        constructor(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        constructor(uint256 moduleTypeId, address module, bytes memory initData)␊
             EIP712("MyAccount", "1")␊
         {␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
@@ -356,12 +359,13 @@ Generated by [AVA](https://avajs.dev).
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked {␊
-        constructor(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        constructor(uint256 moduleTypeId, address module, bytes memory initData)␊
             EIP712("MyAccount", "1")␊
         {␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
@@ -400,11 +404,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccount is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -442,10 +446,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountERC1271 is Initializable, Account, IERC1271, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -492,11 +496,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -534,12 +538,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -577,12 +581,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -620,13 +624,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -664,12 +668,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -716,13 +720,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -730,7 +735,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -779,12 +784,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -792,7 +798,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -838,13 +844,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -852,7 +859,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -901,14 +908,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -916,7 +924,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -965,10 +973,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccount is Initializable, Account, EIP712, ERC7739 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -996,9 +1004,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC1271 is Initializable, Account, IERC1271 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1035,10 +1043,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1066,11 +1074,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1098,11 +1106,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1130,12 +1138,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1163,11 +1171,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1204,12 +1212,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1217,7 +1226,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -1259,11 +1268,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1271,7 +1281,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -1310,12 +1320,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1323,7 +1334,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -1365,13 +1376,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {MODULE_TYPE_EXECUTOR, MODULE_TYPE_VALIDATOR} from "@openzeppelin/contracts/interfaces/draft-IERC7579.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1379,7 +1391,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(uint256 moduleTypeId, address module, bytes calldata initData)␊
+        function initialize(uint256 moduleTypeId, address module, bytes memory initData)␊
             public␊
             initializer␊
         {␊
@@ -1423,8 +1435,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerERC7702 is Account, EIP712, ERC7739, SignerERC7702 {␊
         constructor() EIP712("CustomAccount with SignerERC7702", "1") {}␊
@@ -1465,8 +1477,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerERC7702ERC7739 is Account, EIP712, ERC7739, SignerERC7702 {␊
         constructor() EIP712("CustomAccount with SignerERC7702ERC7739", "1") {}␊
@@ -1482,10 +1494,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerERC7702ERC721Holder is Account, EIP712, ERC7739, SignerERC7702, ERC721Holder {␊
         constructor() EIP712("CustomAccount with SignerERC7702ERC721Holder", "1") {}␊
@@ -1501,10 +1513,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerERC7702ERC1155Holder is Account, EIP712, ERC7739, SignerERC7702, ERC1155Holder {␊
         constructor() EIP712("CustomAccount with SignerERC7702ERC1155Holder", "1") {}␊
@@ -1520,11 +1532,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerERC7702ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerERC7702, ERC721Holder, ERC1155Holder {␊
         constructor()␊
@@ -1542,10 +1554,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, SignerERC7702, ERC7821 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -1569,13 +1581,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerERC7702 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -1625,11 +1637,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, SignerERC7702 {␊
@@ -1675,13 +1687,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerERC7702 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -1731,14 +1743,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerERC7702 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -1790,8 +1802,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSA is Account, EIP712, ERC7739, SignerECDSA {␊
         constructor(address signer)␊
@@ -1837,8 +1849,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC7739 is Account, EIP712, ERC7739, SignerECDSA {␊
         constructor(address signer)␊
@@ -1857,10 +1869,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder {␊
         constructor(address signer)␊
@@ -1879,10 +1891,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC1155Holder {␊
         constructor(address signer)␊
@@ -1901,11 +1913,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊
         constructor(address signer)␊
@@ -1924,10 +1936,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC7821 {␊
         constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
@@ -1951,13 +1963,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊
         constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
@@ -2007,11 +2019,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, SignerECDSA {␊
@@ -2059,13 +2071,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊
         constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
@@ -2115,14 +2127,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerECDSA {␊
         constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
@@ -2172,12 +2184,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2206,11 +2218,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2248,12 +2260,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2282,13 +2294,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2317,13 +2329,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2352,14 +2364,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2390,13 +2402,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2434,15 +2446,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2507,14 +2519,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2576,15 +2588,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2649,16 +2661,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2723,11 +2735,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2749,10 +2761,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2783,11 +2795,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2809,12 +2821,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2836,12 +2848,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2863,13 +2875,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2893,12 +2905,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2929,14 +2941,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2994,13 +3006,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3055,14 +3067,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3120,15 +3132,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3188,8 +3200,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256 is Account, EIP712, ERC7739, SignerP256 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3235,8 +3247,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC7739 is Account, EIP712, ERC7739, SignerP256 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3255,10 +3267,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721Holder is Account, EIP712, ERC7739, SignerP256, ERC721Holder {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3277,10 +3289,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1155Holder is Account, EIP712, ERC7739, SignerP256, ERC1155Holder {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3299,11 +3311,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerP256, ERC721Holder, ERC1155Holder {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3322,10 +3334,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, SignerP256, ERC7821 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3352,13 +3364,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3411,11 +3423,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, SignerP256 {␊
@@ -3463,13 +3475,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3522,14 +3534,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerP256 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -3582,12 +3594,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3616,11 +3628,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3658,12 +3670,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3692,13 +3704,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3727,13 +3739,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3762,14 +3774,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3800,13 +3812,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3844,15 +3856,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3917,14 +3929,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3986,15 +3998,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4059,16 +4071,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4133,11 +4145,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4159,10 +4171,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4193,11 +4205,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4219,12 +4231,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4246,12 +4258,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4273,13 +4285,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4303,12 +4315,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4339,14 +4351,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4404,13 +4416,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4465,14 +4477,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4530,15 +4542,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4598,8 +4610,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSA is Account, EIP712, ERC7739, SignerRSA {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4645,8 +4657,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC7739 is Account, EIP712, ERC7739, SignerRSA {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4665,10 +4677,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721Holder is Account, EIP712, ERC7739, SignerRSA, ERC721Holder {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4687,10 +4699,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1155Holder is Account, EIP712, ERC7739, SignerRSA, ERC1155Holder {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4709,11 +4721,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerRSA, ERC721Holder, ERC1155Holder {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4732,10 +4744,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, SignerRSA, ERC7821 {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4762,13 +4774,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerRSA {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4821,11 +4833,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, SignerRSA {␊
@@ -4873,13 +4885,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerRSA {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4932,14 +4944,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerRSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerRSA {␊
         constructor(bytes memory e, bytes memory n)␊
@@ -4992,12 +5004,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5026,11 +5038,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5068,12 +5080,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5102,13 +5114,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5137,13 +5149,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5172,14 +5184,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5210,13 +5222,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5254,15 +5266,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5327,14 +5339,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5396,15 +5408,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5469,16 +5481,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5543,11 +5555,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5569,10 +5581,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5603,11 +5615,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5629,12 +5641,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5656,12 +5668,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5683,13 +5695,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5713,12 +5725,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5749,14 +5761,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5814,13 +5826,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5875,14 +5887,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5940,15 +5952,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6008,8 +6020,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisig is Account, EIP712, ERC7739, MultiSignerERC7913 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6081,8 +6093,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC7739 is Account, EIP712, ERC7739, MultiSignerERC7913 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6113,10 +6125,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721Holder is Account, EIP712, ERC7739, MultiSignerERC7913, ERC721Holder {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6147,10 +6159,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913, ERC1155Holder {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6181,11 +6193,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913, ERC721Holder, ERC1155Holder {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6216,10 +6228,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, MultiSignerERC7913, ERC7821 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6258,13 +6270,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6329,12 +6341,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, MultiSignerERC7913 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6395,13 +6407,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6466,14 +6478,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, MultiSignerERC7913 {␊
         constructor(bytes[] memory signers, uint64 threshold)␊
@@ -6538,12 +6550,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6587,11 +6599,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6644,12 +6656,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6693,13 +6705,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6743,13 +6755,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6793,14 +6805,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6846,13 +6858,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6905,15 +6917,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6993,14 +7005,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7077,15 +7089,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7165,16 +7177,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7254,11 +7266,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7295,10 +7307,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7344,11 +7356,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7385,12 +7397,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7427,12 +7439,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7469,13 +7481,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7514,12 +7526,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7565,14 +7577,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7645,13 +7657,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7721,14 +7733,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7801,15 +7813,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7884,8 +7896,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeighted is Account, EIP712, ERC7739, MultiSignerERC7913Weighted {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -7971,8 +7983,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC7739 is Account, EIP712, ERC7739, MultiSignerERC7913Weighted {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8010,10 +8022,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721Holder is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC721Holder {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8051,10 +8063,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC1155Holder {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8092,11 +8104,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC721Holder, ERC1155Holder {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8134,10 +8146,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, MultiSignerERC7913Weighted, ERC7821 {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8183,14 +8195,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913Weighted {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8262,13 +8274,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, MultiSignerERC7913Weighted {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8336,14 +8348,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, MultiSignerERC7913Weighted {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8415,15 +8427,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {MultiSignerERC7913} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol";␊
     import {MultiSignerERC7913Weighted} from "@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, MultiSignerERC7913Weighted {␊
         constructor(bytes[] memory signers, uint64[] memory weights, uint64 threshold)␊
@@ -8495,12 +8507,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8551,11 +8563,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8615,12 +8627,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8673,13 +8685,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8732,13 +8744,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8791,14 +8803,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8851,13 +8863,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8917,16 +8929,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9013,15 +9025,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9105,16 +9117,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9201,17 +9213,17 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9298,11 +9310,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9346,10 +9358,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9402,11 +9414,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9452,12 +9464,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9503,12 +9515,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9554,13 +9566,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9606,12 +9618,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9664,15 +9676,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9752,14 +9764,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9836,15 +9848,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9924,16 +9936,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
-    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
diff --git a/packages/core/solidity/src/account.test.ts.snap b/packages/core/solidity/src/account.test.ts.snap
index 8f9f873c2..fcd268f33 100644
Binary files a/packages/core/solidity/src/account.test.ts.snap and b/packages/core/solidity/src/account.test.ts.snap differ
diff --git a/packages/core/solidity/src/account.ts b/packages/core/solidity/src/account.ts
index 919fe86fc..d85c0854d 100644
--- a/packages/core/solidity/src/account.ts
+++ b/packages/core/solidity/src/account.ts
@@ -68,7 +68,6 @@ export function buildAccount(opts: AccountOptions): Contract {
     c.addImportOnly({
       name: 'PackedUserOperation',
       path: '@openzeppelin/contracts/interfaces/draft-IERC4337.sol',
-      transpiled: false, // PackedUserOperation doesn't start with "I" so its not recognized as an "interface object"
     });
   }
 
@@ -172,9 +171,17 @@ function addERC7579Modules(c: ContractBuilder, opts: AccountOptions): void {
 
   // Accounts that use ERC7579 without a signer must be constructed with at least one module (executor of validation)
   if (!opts.signer) {
+    c.addImportOnly({
+      name: 'MODULE_TYPE_VALIDATOR',
+      path: '@openzeppelin/contracts/interfaces/draft-IERC7579.sol',
+    });
+    c.addImportOnly({
+      name: 'MODULE_TYPE_EXECUTOR',
+      path: '@openzeppelin/contracts/interfaces/draft-IERC7579.sol',
+    });
     c.addConstructorArgument({ type: 'uint256', name: 'moduleTypeId' });
     c.addConstructorArgument({ type: 'address', name: 'module' });
-    c.addConstructorArgument({ type: 'bytes calldata', name: 'initData' });
+    c.addConstructorArgument({ type: 'bytes memory', name: 'initData' });
     c.addConstructorCode('require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);');
     c.addConstructorCode('_installModule(moduleTypeId, module, initData);');
   }
diff --git a/packages/core/solidity/src/custom.test.ts.md b/packages/core/solidity/src/custom.test.ts.md
index 7906d5648..d542739d8 100644
--- a/packages/core/solidity/src/custom.test.ts.md
+++ b/packages/core/solidity/src/custom.test.ts.md
@@ -78,8 +78,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -168,8 +168,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
diff --git a/packages/core/solidity/src/custom.test.ts.snap b/packages/core/solidity/src/custom.test.ts.snap
index 6e45868eb..d07b429fd 100644
Binary files a/packages/core/solidity/src/custom.test.ts.snap and b/packages/core/solidity/src/custom.test.ts.snap differ
diff --git a/packages/core/solidity/src/erc1155.test.ts.md b/packages/core/solidity/src/erc1155.test.ts.md
index 470826aa4..3ef4344a2 100644
--- a/packages/core/solidity/src/erc1155.test.ts.md
+++ b/packages/core/solidity/src/erc1155.test.ts.md
@@ -12,8 +12,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable {␊
         constructor(address initialOwner)␊
@@ -35,8 +35,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyTokec is ERC1155, Ownable {␊
         constructor(address initialOwner)␊
@@ -135,9 +135,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {ERC1155Burnable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Burnable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Burnable {␊
         constructor(address initialOwner)␊
@@ -159,9 +159,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {ERC1155Pausable} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Pausable {␊
         constructor(address initialOwner)␊
@@ -200,8 +200,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable {␊
         constructor(address initialOwner)␊
@@ -327,9 +327,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
     import {ERC1155Supply} from "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC1155, Ownable, ERC1155Supply {␊
         constructor(address initialOwner)␊
@@ -361,10 +361,10 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -445,11 +445,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -539,11 +539,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessManagedUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/solidity/src/erc1155.test.ts.snap b/packages/core/solidity/src/erc1155.test.ts.snap
index a7faff1b1..ba937497a 100644
Binary files a/packages/core/solidity/src/erc1155.test.ts.snap and b/packages/core/solidity/src/erc1155.test.ts.snap differ
diff --git a/packages/core/solidity/src/erc20.test.ts.md b/packages/core/solidity/src/erc20.test.ts.md
index e422ee059..a9f358065 100644
--- a/packages/core/solidity/src/erc20.test.ts.md
+++ b/packages/core/solidity/src/erc20.test.ts.md
@@ -61,10 +61,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -182,11 +182,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -322,9 +322,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -376,8 +376,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyToken is ERC20, ERC1363, ERC20Permit {␊
@@ -544,8 +544,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
         address public tokenBridge;␊
@@ -573,10 +573,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, Ownable {␊
         address public tokenBridge;␊
@@ -605,11 +605,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Burnable, Ownable, ERC20Permit {␊
         address public tokenBridge;␊
@@ -644,8 +644,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, AccessControl, ERC20Permit {␊
         bytes32 public constant TOKEN_BRIDGE_ROLE = keccak256("TOKEN_BRIDGE_ROLE");␊
@@ -687,8 +687,8 @@ Generated by [AVA](https://avajs.dev).
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, AccessManaged, ERC20Permit {␊
         error Unauthorized();␊
@@ -715,8 +715,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
@@ -743,10 +743,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, Ownable {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
@@ -779,8 +779,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, AccessControl {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
@@ -825,8 +825,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit, AccessManaged {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
@@ -857,10 +857,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-    import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊
         address public tokenBridge;␊
@@ -894,10 +894,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-    import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
@@ -955,8 +955,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
         address public tokenBridge;␊
@@ -988,8 +988,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     ␊
     contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
@@ -1024,17 +1024,17 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-    import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
+    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, AccessControlUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant TOKEN_BRIDGE_ROLE = keccak256("TOKEN_BRIDGE_ROLE");␊
@@ -1133,14 +1133,14 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
@@ -1221,16 +1221,16 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -1319,16 +1319,16 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+    import {ERC1363Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC1363Upgradeable.sol";␊
     import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
     import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/solidity/src/erc20.test.ts.snap b/packages/core/solidity/src/erc20.test.ts.snap
index c78c752bc..e704c2ace 100644
Binary files a/packages/core/solidity/src/erc20.test.ts.snap and b/packages/core/solidity/src/erc20.test.ts.snap differ
diff --git a/packages/core/solidity/src/erc721.test.ts.md b/packages/core/solidity/src/erc721.test.ts.md
index 5cbc3f8d9..782638b2e 100644
--- a/packages/core/solidity/src/erc721.test.ts.md
+++ b/packages/core/solidity/src/erc721.test.ts.md
@@ -139,9 +139,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, Ownable {␊
         constructor(address initialOwner)␊
@@ -187,9 +187,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721URIStorage} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721URIStorage, Ownable {␊
         uint256 private _nextTokenId;␊
@@ -293,9 +293,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Pausable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Pausable.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyToken is ERC721, ERC721Pausable, Ownable {␊
         constructor(address initialOwner)␊
@@ -331,8 +331,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721, Ownable {␊
         constructor(address initialOwner)␊
@@ -413,8 +413,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     ␊
     contract MyToken is ERC721, Ownable {␊
         uint256 private _nextTokenId;␊
@@ -440,9 +440,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
         constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊
@@ -474,9 +474,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
         constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊
@@ -508,9 +508,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
     import {ERC721Votes} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Votes.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     ␊
     contract MyToken is ERC721, EIP712, ERC721Votes {␊
         constructor() ERC721("MyToken", "MTK") EIP712("MyToken", "1") {}␊
@@ -551,14 +551,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -624,15 +624,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
+    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -706,14 +706,14 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import {ERC721BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721BurnableUpgradeable.sol";␊
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, AccessManagedUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/solidity/src/erc721.test.ts.snap b/packages/core/solidity/src/erc721.test.ts.snap
index a2ed828ab..1b82fb258 100644
Binary files a/packages/core/solidity/src/erc721.test.ts.snap and b/packages/core/solidity/src/erc721.test.ts.snap differ
diff --git a/packages/core/solidity/src/generate/account.ts b/packages/core/solidity/src/generate/account.ts
index 685e23bb8..b633e2a18 100644
--- a/packages/core/solidity/src/generate/account.ts
+++ b/packages/core/solidity/src/generate/account.ts
@@ -1,16 +1,19 @@
-import type { AccountOptions } from '../account';
+import { ERC7579ModulesOptions, SignatureValidationOptions, type AccountOptions } from '../account';
 import { infoOptions } from '../set-info';
 import { upgradeableOptions } from '../set-upgradeable';
+import { SignerOptions } from '../signer';
 import { generateAlternatives } from './alternatives';
 
+const booleans = [true, false] as const;
+
 const account = {
   name: ['MyAccount'],
-  signatureValidation: [false, 'ERC1271', 'ERC7739'] as const,
-  ERC721Holder: [false, true] as const,
-  ERC1155Holder: [false, true] as const,
-  signer: ['ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const,
-  batchedExecution: [false, true] as const,
-  ERC7579Modules: [false, 'AccountERC7579', 'AccountERC7579Hooked'] as const,
+  signatureValidation: SignatureValidationOptions,
+  ERC721Holder: booleans,
+  ERC1155Holder: booleans,
+  signer: SignerOptions,
+  batchedExecution: booleans,
+  ERC7579Modules: ERC7579ModulesOptions,
   access: [false] as const,
   upgradeable: upgradeableOptions,
   info: infoOptions,
diff --git a/packages/core/solidity/src/governor.test.ts.md b/packages/core/solidity/src/governor.test.ts.md
index 8ab51e516..fc768991a 100644
--- a/packages/core/solidity/src/governor.test.ts.md
+++ b/packages/core/solidity/src/governor.test.ts.md
@@ -13,12 +13,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -103,12 +103,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -189,11 +189,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -281,11 +281,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -373,13 +373,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -462,13 +462,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorStorage} from "@openzeppelin/contracts/governance/extensions/GovernorStorage.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorStorage, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -557,12 +557,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -643,12 +643,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -729,11 +729,11 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -821,13 +821,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -910,12 +910,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -996,12 +996,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1086,12 +1086,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1176,8 +1176,8 @@ Generated by [AVA](https://avajs.dev).
     import {GovernorTimelockCompound} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockCompound.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
-    import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {ICompoundTimelock} from "@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockCompound {␊
         constructor(IVotes _token, ICompoundTimelock _timelock)␊
@@ -1258,13 +1258,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1347,12 +1347,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1433,13 +1433,13 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorSettings} from "@openzeppelin/contracts/governance/extensions/GovernorSettings.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorSettings, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1522,12 +1522,12 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
+    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     import {GovernorCountingSimple} from "@openzeppelin/contracts/governance/extensions/GovernorCountingSimple.sol";␊
     import {GovernorTimelockControl} from "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.sol";␊
     import {GovernorVotes} from "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol";␊
     import {GovernorVotesQuorumFraction} from "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {TimelockController} from "@openzeppelin/contracts/governance/TimelockController.sol";␊
     ␊
     contract MyGovernor is Governor, GovernorCountingSimple, GovernorVotes, GovernorVotesQuorumFraction, GovernorTimelockControl {␊
         constructor(IVotes _token, TimelockController _timelock)␊
@@ -1608,14 +1608,14 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
+    import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊
     import {GovernorCountingSimpleUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorCountingSimpleUpgradeable.sol";␊
     import {GovernorTimelockControlUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorTimelockControlUpgradeable.sol";␊
-    import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
     import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
-    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
+    import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     ␊
     contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
diff --git a/packages/core/solidity/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap
index 6eca252ca..2cb6b9f58 100644
Binary files a/packages/core/solidity/src/governor.test.ts.snap and b/packages/core/solidity/src/governor.test.ts.snap differ
diff --git a/packages/core/solidity/src/governor.ts b/packages/core/solidity/src/governor.ts
index 936d76b2a..e5f68db9c 100644
--- a/packages/core/solidity/src/governor.ts
+++ b/packages/core/solidity/src/governor.ts
@@ -247,12 +247,10 @@ function addVotes(c: ContractBuilder) {
   c.addImportOnly({
     name: 'IVotes',
     path: `@openzeppelin/contracts/governance/utils/IVotes.sol`,
-    transpiled: false,
   });
   c.addConstructorArgument({
     type: {
       name: 'IVotes',
-      transpiled: false,
     },
     name: tokenArg,
   });
@@ -322,7 +320,6 @@ const timelockModules = {
     timelockType: {
       name: 'ICompoundTimelock',
       path: `@openzeppelin/contracts/vendor/compound/ICompoundTimelock.sol`,
-      transpiled: false,
     },
     timelockParent: {
       name: 'GovernorTimelockCompound',
diff --git a/packages/core/solidity/src/infer-transpiled.test.ts b/packages/core/solidity/src/infer-transpiled.test.ts
index cccffeeab..cef425156 100644
--- a/packages/core/solidity/src/infer-transpiled.test.ts
+++ b/packages/core/solidity/src/infer-transpiled.test.ts
@@ -9,4 +9,32 @@ test('infer transpiled', t => {
   t.false(inferTranspiled({ name: 'IFoo' }));
   t.true(inferTranspiled({ name: 'IFoo', transpiled: true }));
   t.false(inferTranspiled({ name: 'IFoo', transpiled: false }));
+
+  t.true(inferTranspiled({ name: 'Ifoo' }));
+  t.true(inferTranspiled({ name: 'Ifoo', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Ifoo', transpiled: false }));
+
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/IFoo.sol' }));
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/IFoo.sol', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/IFoo.sol', transpiled: false }));
+
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/Ifoo.sol' }));
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/Ifoo.sol', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/Ifoo.sol', transpiled: false }));
+
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/Foo.sol' }));
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/Foo.sol', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/Foo.sol', transpiled: false }));
+
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-IFoo.sol' }));
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-IFoo.sol', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-IFoo.sol', transpiled: false }));
+
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-Ifoo.sol' }));
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-Ifoo.sol', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-Ifoo.sol', transpiled: false }));
+
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-Foo.sol' }));
+  t.true(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-Foo.sol', transpiled: true }));
+  t.false(inferTranspiled({ name: 'Foo', path: '@org/package/contracts/draft-Foo.sol', transpiled: false }));
 });
diff --git a/packages/core/solidity/src/infer-transpiled.ts b/packages/core/solidity/src/infer-transpiled.ts
index f338ea6a4..5eb4a0302 100644
--- a/packages/core/solidity/src/infer-transpiled.ts
+++ b/packages/core/solidity/src/infer-transpiled.ts
@@ -1,5 +1,11 @@
 import type { ReferencedContract } from './contract';
 
-export function inferTranspiled(c: ReferencedContract): boolean {
-  return c.transpiled ?? !/^I[A-Z]/.test(c.name);
+export function inferTranspiled(c: ReferencedContract & { path?: string }): boolean {
+  if (c.transpiled !== undefined) {
+    return c.transpiled;
+  } else if (c.path !== undefined) {
+    return !/\/(draft-)?I[A-Z]\w+.sol$/.test(c.path);
+  } else {
+    return !/^I[A-Z]/.test(c.name);
+  }
 }
diff --git a/packages/core/solidity/src/print.ts b/packages/core/solidity/src/print.ts
index bc6202d7d..ccee552ba 100644
--- a/packages/core/solidity/src/print.ts
+++ b/packages/core/solidity/src/print.ts
@@ -278,18 +278,14 @@ function printNatspecTags(tags: NatspecTag[]): string[] {
 }
 
 function printImports(imports: ImportContract[], helpers: Helpers): string[] {
-  // Sort imports by name
-  imports.sort((a, b) => {
-    if (a.name < b.name) return -1;
-    if (a.name > b.name) return 1;
-    return 0;
-  });
-
-  const lines: string[] = [];
-  imports.map(p => {
-    const importContract = helpers.transformImport(p);
-    lines.push(`import {${importContract.name}} from "${importContract.path}";`);
-  });
-
-  return lines;
+  const itemByPath = new Map<string, Set<string>>();
+
+  for (const p of imports) {
+    const { name, path } = helpers.transformImport(p);
+    const _ = itemByPath.get(path)?.add(name) ?? itemByPath.set(path, new Set([name]));
+  }
+
+  return Array.from(itemByPath.keys())
+    .sort()
+    .map(path => `import {${Array.from(itemByPath.get(path)!).sort().join(', ')}} from "${path}";`);
 }
diff --git a/packages/core/solidity/src/stablecoin.test.ts.md b/packages/core/solidity/src/stablecoin.test.ts.md
index 8aaaeb841..061ca5356 100644
--- a/packages/core/solidity/src/stablecoin.test.ts.md
+++ b/packages/core/solidity/src/stablecoin.test.ts.md
@@ -45,10 +45,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -166,11 +166,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Burnable, ERC20Pausable, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -243,9 +243,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
     ␊
     contract MyStablecoin is ERC20, Ownable, ERC20Permit {␊
         constructor(address initialOwner)␊
@@ -297,8 +297,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC1363, ERC20Permit {␊
@@ -330,10 +330,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Custodian} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Custodian, Ownable {␊
         constructor(address initialOwner)␊
@@ -365,10 +365,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Allowlist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Allowlist, Ownable {␊
         constructor(address initialOwner)␊
@@ -411,10 +411,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Blocklist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Blocklist.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
+    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Permit, ERC20Blocklist, Ownable {␊
         constructor(address initialOwner)␊
@@ -591,17 +591,17 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 2d607bd␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {ERC20Allowlist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
+    import {ERC20Custodian} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
-    import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Allowlist} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Allowlist.sol";␊
-    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
+    import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
     import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";␊
-    import {ERC20Custodian} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol";␊
     import {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20Votes} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Votes.sol";␊
+    import {ERC20Bridgeable} from "@openzeppelin/contracts/token/ERC20/extensions/draft-ERC20Bridgeable.sol";␊
     import {Nonces} from "@openzeppelin/contracts/utils/Nonces.sol";␊
     ␊
     contract MyStablecoin is ERC20, ERC20Bridgeable, AccessControl, ERC20Burnable, ERC20Pausable, ERC1363, ERC20Permit, ERC20Votes, ERC20FlashMint, ERC20Custodian, ERC20Allowlist {␊
diff --git a/packages/core/solidity/src/stablecoin.test.ts.snap b/packages/core/solidity/src/stablecoin.test.ts.snap
index ab2244c77..f733539e8 100644
Binary files a/packages/core/solidity/src/stablecoin.test.ts.snap and b/packages/core/solidity/src/stablecoin.test.ts.snap differ
diff --git a/packages/core/solidity/src/zip-foundry.test.ts.md b/packages/core/solidity/src/zip-foundry.test.ts.md
index f3f4dfc1f..29d0d9e46 100644
--- a/packages/core/solidity/src/zip-foundry.test.ts.md
+++ b/packages/core/solidity/src/zip-foundry.test.ts.md
@@ -333,17 +333,17 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-      import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
       import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
       import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
       import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
       import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
       import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
           address public tokenBridge;␊
@@ -576,10 +576,10 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.27;␊
       ␊
       import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
-      import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-      import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
+      import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20PermitUpgradeable, AccessControlUpgradeable, UUPSUpgradeable {␊
           bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
@@ -763,10 +763,10 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
-      import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -929,8 +929,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
-      import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
       import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+      import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
       ␊
       contract MyToken is ERC1155, Ownable {␊
           constructor(address initialOwner)␊
@@ -1095,9 +1095,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
-      import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -1259,11 +1259,11 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.27;␊
       ␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
       import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-      import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+      import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
       ␊
       contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊
           constructor(address signer) EIP712("My Account", "1") SignerECDSA(signer) {}␊
@@ -1423,14 +1423,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
       import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-      import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
diff --git a/packages/core/solidity/src/zip-foundry.test.ts.snap b/packages/core/solidity/src/zip-foundry.test.ts.snap
index 7debb3adf..2dd4125e5 100644
Binary files a/packages/core/solidity/src/zip-foundry.test.ts.snap and b/packages/core/solidity/src/zip-foundry.test.ts.snap differ
diff --git a/packages/core/solidity/src/zip-hardhat.test.ts.md b/packages/core/solidity/src/zip-hardhat.test.ts.md
index 745b178b5..13b5cb5c6 100644
--- a/packages/core/solidity/src/zip-hardhat.test.ts.md
+++ b/packages/core/solidity/src/zip-hardhat.test.ts.md
@@ -140,17 +140,17 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
-      import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
       import {ERC20BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";␊
       import {ERC20FlashMintUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20FlashMintUpgradeable.sol";␊
       import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
       import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
       import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
           address public tokenBridge;␊
@@ -306,10 +306,10 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
-      import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -411,8 +411,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
-      import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
       import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
+      import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
       ␊
       contract MyToken is ERC1155, Ownable {␊
           constructor(address initialOwner)␊
@@ -496,11 +496,11 @@ Generated by [AVA](https://avajs.dev).
       pragma solidity ^0.8.27;␊
       ␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
       import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-      import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+      import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
       ␊
       contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊
           constructor(address signer) EIP712("My Account", "1") SignerECDSA(signer) {}␊
@@ -574,14 +574,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.4.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
       import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
+      import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
       import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-      import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
diff --git a/packages/core/solidity/src/zip-hardhat.test.ts.snap b/packages/core/solidity/src/zip-hardhat.test.ts.snap
index 29d2250f4..279682c9d 100644
Binary files a/packages/core/solidity/src/zip-hardhat.test.ts.snap and b/packages/core/solidity/src/zip-hardhat.test.ts.snap differ