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 3c33b3548..98698b3c5 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);␊
@@ -401,10 +405,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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccount is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -485,10 +489,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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -523,11 +527,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 {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 Initializable, Account, EIP712, ERC7739, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -562,11 +566,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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 Initializable, Account, EIP712, ERC7739, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -601,12 +605,12 @@ 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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -641,11 +645,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 {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/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -688,13 +692,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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␊
@@ -702,7 +707,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␊
         {␊
@@ -750,11 +755,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, UUPSUpgradeable {␊
@@ -763,7 +769,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␊
         {␊
@@ -808,13 +814,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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␊
@@ -822,7 +829,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␊
         {␊
@@ -870,14 +877,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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␊
@@ -885,7 +893,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␊
         {␊
@@ -934,9 +942,9 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccount is Initializable, Account, EIP712, ERC7739 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1004,9 +1012,9 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1035,10 +1043,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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1067,10 +1075,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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1099,11 +1107,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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1132,10 +1140,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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1172,12 +1180,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1185,7 +1194,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␊
         {␊
@@ -1227,11 +1236,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1239,7 +1249,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␊
         {␊
@@ -1278,12 +1288,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1291,7 +1302,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␊
         {␊
@@ -1333,13 +1344,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1347,7 +1359,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␊
         {␊
@@ -1391,8 +1403,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)␊
@@ -1438,8 +1450,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)␊
@@ -1458,10 +1470,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)␊
@@ -1480,10 +1492,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)␊
@@ -1502,11 +1514,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)␊
@@ -1525,10 +1537,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) {}␊
@@ -1552,13 +1564,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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) {}␊
@@ -1608,11 +1620,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {␊
@@ -1660,13 +1672,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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) {}␊
@@ -1716,14 +1728,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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) {}␊
@@ -1773,12 +1785,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1806,10 +1818,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable, UUPSUpgradeable {␊
@@ -1847,12 +1859,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1880,13 +1892,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1914,13 +1926,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1948,14 +1960,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1985,13 +1997,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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, SignerECDSAUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2028,15 +2040,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2100,14 +2112,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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␊
@@ -2168,15 +2180,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2240,16 +2252,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerECDSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2313,11 +2325,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -2339,10 +2351,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2373,11 +2385,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -2399,12 +2411,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -2426,12 +2438,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -2453,13 +2465,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -2483,12 +2495,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.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, SignerECDSAUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2519,14 +2531,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2584,13 +2596,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -2645,14 +2657,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2710,15 +2722,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -2778,8 +2790,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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerEIP7702 is Account, EIP712, ERC7739, SignerEIP7702 {␊
         constructor() EIP712("CustomAccount with SignerEIP7702", "1") {}␊
@@ -2820,8 +2832,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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerEIP7702ERC7739 is Account, EIP712, ERC7739, SignerEIP7702 {␊
         constructor() EIP712("CustomAccount with SignerEIP7702ERC7739", "1") {}␊
@@ -2837,10 +2849,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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerEIP7702ERC721Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC721Holder {␊
         constructor() EIP712("CustomAccount with SignerEIP7702ERC721Holder", "1") {}␊
@@ -2856,10 +2868,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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerEIP7702ERC1155Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC1155Holder {␊
         constructor() EIP712("CustomAccount with SignerEIP7702ERC1155Holder", "1") {}␊
@@ -2875,11 +2887,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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerEIP7702ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC721Holder, ERC1155Holder {␊
         constructor()␊
@@ -2897,10 +2909,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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, SignerEIP7702, ERC7821 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -2924,13 +2936,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerEIP7702 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -2980,11 +2992,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
     contract MyAccount is Account, IERC1271, AccountERC7579, SignerEIP7702 {␊
@@ -3030,13 +3042,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerEIP7702 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -3086,14 +3098,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerEIP7702 {␊
         constructor() EIP712("MyAccount", "1") {}␊
@@ -3145,8 +3157,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)␊
@@ -3218,8 +3230,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)␊
@@ -3250,10 +3262,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)␊
@@ -3284,10 +3296,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)␊
@@ -3318,11 +3330,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)␊
@@ -3353,10 +3365,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)␊
@@ -3395,13 +3407,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -3466,12 +3478,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -3532,13 +3544,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -3603,14 +3615,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -3675,12 +3687,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3723,10 +3735,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
@@ -3779,12 +3791,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3827,13 +3839,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3876,13 +3888,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3925,14 +3937,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3977,13 +3989,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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, MultiSignerERC7913Upgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4035,15 +4047,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -4122,14 +4134,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -4205,15 +4217,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -4292,16 +4304,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -4380,11 +4392,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -4421,10 +4433,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4470,11 +4482,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -4511,12 +4523,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -4553,12 +4565,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -4595,13 +4607,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -4640,12 +4652,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.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, MultiSignerERC7913Upgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4691,14 +4703,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -4771,13 +4783,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -4847,14 +4859,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -4927,15 +4939,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -5010,8 +5022,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)␊
@@ -5097,8 +5109,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)␊
@@ -5136,10 +5148,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)␊
@@ -5177,10 +5189,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)␊
@@ -5218,11 +5230,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)␊
@@ -5260,10 +5272,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)␊
@@ -5309,14 +5321,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -5388,13 +5400,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -5462,14 +5474,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -5541,15 +5553,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -5621,12 +5633,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5676,10 +5688,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
@@ -5739,12 +5751,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5796,13 +5808,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5854,13 +5866,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5912,14 +5924,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5971,13 +5983,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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, MultiSignerERC7913WeightedUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6036,16 +6048,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -6131,15 +6143,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -6222,16 +6234,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -6317,17 +6329,17 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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␊
@@ -6413,11 +6425,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -6461,10 +6473,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6517,11 +6529,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -6567,12 +6579,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -6618,12 +6630,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -6669,13 +6681,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -6721,12 +6733,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.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, MultiSignerERC7913WeightedUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6779,15 +6791,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -6867,14 +6879,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -6951,15 +6963,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -7039,16 +7051,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -7130,8 +7142,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)␊
@@ -7177,8 +7189,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)␊
@@ -7197,10 +7209,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)␊
@@ -7219,10 +7231,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)␊
@@ -7241,11 +7253,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)␊
@@ -7264,10 +7276,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)␊
@@ -7294,13 +7306,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -7353,11 +7365,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {␊
@@ -7405,13 +7417,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -7464,14 +7476,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -7524,12 +7536,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7557,10 +7569,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, UUPSUpgradeable {␊
@@ -7598,12 +7610,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7631,13 +7643,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7665,13 +7677,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7699,14 +7711,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7736,13 +7748,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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, SignerP256Upgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7779,15 +7791,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7851,14 +7863,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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␊
@@ -7919,15 +7931,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7991,16 +8003,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8064,11 +8076,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -8090,10 +8102,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8124,11 +8136,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -8150,12 +8162,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -8177,12 +8189,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -8204,13 +8216,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -8234,12 +8246,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.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, SignerP256Upgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8270,14 +8282,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8335,13 +8347,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -8396,14 +8408,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8461,15 +8473,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8529,8 +8541,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)␊
@@ -8576,8 +8588,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)␊
@@ -8596,10 +8608,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)␊
@@ -8618,10 +8630,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)␊
@@ -8640,11 +8652,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)␊
@@ -8663,10 +8675,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)␊
@@ -8693,13 +8705,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -8752,11 +8764,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {␊
@@ -8804,13 +8816,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -8863,14 +8875,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -8923,12 +8935,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8956,10 +8968,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable, UUPSUpgradeable {␊
@@ -8997,12 +9009,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9030,13 +9042,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9064,13 +9076,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9098,14 +9110,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9135,13 +9147,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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, SignerRSAUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9178,15 +9190,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9250,14 +9262,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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␊
@@ -9318,15 +9330,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9390,16 +9402,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9463,11 +9475,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -9489,10 +9501,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9523,11 +9535,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -9549,12 +9561,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -9576,12 +9588,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -9603,13 +9615,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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/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␊
@@ -9633,12 +9645,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
+    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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.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, SignerRSAUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9669,14 +9681,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9734,13 +9746,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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␊
@@ -9795,14 +9807,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9860,15 +9872,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerRSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9926,12 +9938,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthn is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -9960,9 +9972,9 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
     ␊
@@ -9999,12 +10011,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC7739 is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10033,13 +10045,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC721Holder is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC721Holder {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10068,13 +10080,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC1155Holder is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC1155Holder {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10103,14 +10115,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC721Holder, ERC1155Holder {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10139,13 +10151,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {SignerP256} from "@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, SignerP256, SignerWebAuthn, ERC7821 {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10183,14 +10195,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256, SignerWebAuthn {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10243,11 +10255,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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";␊
     import {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
     ␊
@@ -10296,14 +10308,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerP256, SignerWebAuthn {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10356,15 +10368,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {SignerWebAuthn} from "@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol";␊
+    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     ␊
     contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerP256, SignerWebAuthn {␊
         constructor(bytes32 qx, bytes32 qy)␊
@@ -10417,14 +10429,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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 CustomAccountWithSignerWebAuthn is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10464,13 +10476,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10519,14 +10531,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
-    import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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 CustomAccountWithSignerWebAuthnERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10566,15 +10578,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.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 CustomAccountWithSignerWebAuthnERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10614,15 +10626,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.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 CustomAccountWithSignerWebAuthnERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10662,16 +10674,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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 {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10713,15 +10725,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10770,16 +10782,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10844,15 +10856,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10914,16 +10926,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -10988,17 +11000,17 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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, SignerP256Upgradeable, SignerWebAuthnUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11063,13 +11075,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthn is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11103,12 +11115,12 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11151,13 +11163,13 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11191,14 +11203,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11232,14 +11244,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.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";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11273,15 +11285,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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 {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerWebAuthnERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11317,14 +11329,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
+    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
+    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.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 {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.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, SignerP256Upgradeable, SignerWebAuthnUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11367,15 +11379,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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, SignerWebAuthnUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11434,14 +11446,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, SignerWebAuthnUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11497,15 +11509,15 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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/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 {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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, SignerWebAuthnUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -11564,16 +11576,16 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     import {SignerWebAuthnUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerWebAuthnUpgradeable.sol";␊
+    import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
+    import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.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, SignerWebAuthnUpgradeable {␊
         /// @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 c3a0f6d55..e6d006cf6 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 95d191b6c..9cbed81c3 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 2b1cbfabd..99d488ff4 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.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -167,8 +167,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/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 49ad9558e..c6d5ef4b7 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 b2a6a9e62..761e35fea 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.5.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.5.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.5.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.5.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.5.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.5.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)␊
diff --git a/packages/core/solidity/src/erc1155.test.ts.snap b/packages/core/solidity/src/erc1155.test.ts.snap
index b3d7d8ad0..a5cb3637b 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 b383936ca..1e2698e86 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.5.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.5.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.5.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.5.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.5.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.5.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.5.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;␊
@@ -858,8 +858,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     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 {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊
@@ -908,8 +908,8 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.27;␊
     ␊
     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 {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊
@@ -968,8 +968,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;␊
@@ -1001,8 +1001,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;␊
@@ -1037,16 +1037,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 {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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, AccessControlUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -1145,15 +1145,15 @@ 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 {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/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
@@ -1233,15 +1233,15 @@ 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 {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/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -1330,15 +1330,15 @@ 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 {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/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
diff --git a/packages/core/solidity/src/erc20.test.ts.snap b/packages/core/solidity/src/erc20.test.ts.snap
index a99c9f791..bcd9ea77e 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 6d590c069..f00af278b 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.5.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.5.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.5.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.5.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.5.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.5.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.5.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.5.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,11 +551,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyNFTToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
@@ -627,11 +627,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyNFTToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:storage-location erc7201:myNftProject.MyNFTToken␊
@@ -696,11 +696,11 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
+    import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:storage-location erc7201:MyToken␊
@@ -761,14 +761,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -834,14 +834,14 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {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 {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
@@ -915,12 +915,12 @@ 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 {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 {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
@@ -995,12 +995,12 @@ 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 {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 {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
@@ -1090,12 +1090,12 @@ 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 {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 {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
diff --git a/packages/core/solidity/src/erc721.test.ts.snap b/packages/core/solidity/src/erc721.test.ts.snap
index 87b359e83..eff0b1b61 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 e92df43f9..0928beb2b 100644
--- a/packages/core/solidity/src/generate/account.ts
+++ b/packages/core/solidity/src/generate/account.ts
@@ -1,16 +1,28 @@
-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'],
+<<<<<<< HEAD
+  signatureValidation: SignatureValidationOptions,
+  ERC721Holder: booleans,
+  ERC1155Holder: booleans,
+  signer: SignerOptions,
+  batchedExecution: booleans,
+  ERC7579Modules: ERC7579ModulesOptions,
+=======
   signatureValidation: [false, 'ERC1271', 'ERC7739'] as const,
   ERC721Holder: [false, true] as const,
   ERC1155Holder: [false, true] as const,
   signer: ['ECDSA', 'EIP7702', 'Multisig', 'MultisigWeighted', 'P256', 'RSA', 'WebAuthn'] as const,
   batchedExecution: [false, true] as const,
   ERC7579Modules: [false, 'AccountERC7579', 'AccountERC7579Hooked'] as const,
+>>>>>>> master
   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 8d95bb17e..e8e1532f2 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,13 +1608,13 @@ 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 {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
     import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-    import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊
     import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, UUPSUpgradeable {␊
diff --git a/packages/core/solidity/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap
index 3bf56f6d2..e9a3ff3b4 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 6dd8a0e13..d8534758b 100644
--- a/packages/core/solidity/src/governor.ts
+++ b/packages/core/solidity/src/governor.ts
@@ -249,12 +249,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,
   });
@@ -324,7 +322,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 3fec7d721..6f349db31 100644
--- a/packages/core/solidity/src/print.ts
+++ b/packages/core/solidity/src/print.ts
@@ -334,20 +334,16 @@ 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}";`);
-  });
+  const itemByPath = new Map<string, Set<string>>();
 
-  return lines;
+  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}";`);
 }
 
 function printLibraries(contract: Contract, { transformName }: Helpers): string[] {
diff --git a/packages/core/solidity/src/stablecoin.test.ts.md b/packages/core/solidity/src/stablecoin.test.ts.md
index 638d42985..567403244 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.5.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.5.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.5.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)␊
@@ -322,8 +322,8 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.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 {␊
@@ -355,10 +355,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
     import {ERC20Freezable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.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, ERC20Freezable, Ownable {␊
         constructor(address initialOwner)␊
@@ -390,10 +390,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.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, ERC20Restricted, Ownable {␊
         constructor(address initialOwner)␊
@@ -433,10 +433,10 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
-    import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
     import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.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, ERC20Restricted, Ownable {␊
         constructor(address initialOwner)␊
@@ -606,17 +606,17 @@ Generated by [AVA](https://avajs.dev).
     // Compatible with OpenZeppelin Contracts ^5.5.0 and Community Contracts commit b0ddd27␊
     pragma solidity ^0.8.27;␊
     ␊
+    import {ERC20Freezable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.sol";␊
+    import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.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 {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 {ERC20FlashMint} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20FlashMint.sol";␊
-    import {ERC20Freezable} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.sol";␊
     import {ERC20Pausable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Pausable.sol";␊
     import {ERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Permit.sol";␊
-    import {ERC20Restricted} from "@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.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, ERC20Freezable, ERC20Restricted {␊
diff --git a/packages/core/solidity/src/stablecoin.test.ts.snap b/packages/core/solidity/src/stablecoin.test.ts.snap
index f790a3156..00f762c43 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 9406e6291..991ca6479 100644
--- a/packages/core/solidity/src/zip-foundry.test.ts.md
+++ b/packages/core/solidity/src/zip-foundry.test.ts.md
@@ -333,16 +333,16 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -774,9 +774,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -939,8 +939,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -1105,9 +1105,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -1269,11 +1269,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) {}␊
@@ -1433,14 +1433,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-      import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts/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 be784713f..cdcc63d83 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 013cb77e2..14c36f638 100644
--- a/packages/core/solidity/src/zip-hardhat.test.ts.md
+++ b/packages/core/solidity/src/zip-hardhat.test.ts.md
@@ -141,16 +141,16 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.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/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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
@@ -320,9 +320,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
       import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
-      import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
@@ -425,8 +425,8 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.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)␊
@@ -511,11 +511,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) {}␊
@@ -590,14 +590,14 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Contracts ^5.5.0␊
       pragma solidity ^0.8.27;␊
       ␊
+      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 {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.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/proxy/utils/Initializable.sol";␊
-      import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts/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 40e55eefa..4c785dab6 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