diff --git a/contracts/audit/METRICS.html b/contracts/audit/METRICS.html
index df48b7b11..31a6b6e73 100644
--- a/contracts/audit/METRICS.html
+++ b/contracts/audit/METRICS.html
@@ -208793,25 +208793,24 @@
     <script>
       let staticMetrics = {
         markdownTemplate:
-          '\n[<img width="200" alt="get in touch with Consensys Diligence" src="https://user-images.githubusercontent.com/2865694/56826101-91dcf380-685b-11e9-937c-af49c2510aa0.png">](https://consensys.io/diligence)<br/>\n<sup>\n[[  🌐  ](https://consensys.io/diligence)  [  📩  ](mailto:diligence@consensys.net)  [  🔥  ](https://consensys.io/diligence/tools/)]\n</sup><br/><br/>\n\n\n\n# Solidity Metrics for \'CLI\'\n\n## Table of contents\n\n- [Scope](#t-scope)\n    - [Source Units in Scope](#t-source-Units-in-Scope)\n        - [Deployable Logic Contracts](#t-deployable-contracts)\n    - [Out of Scope](#t-out-of-scope)\n        - [Excluded Source Units](#t-out-of-scope-excluded-source-units)\n        - [Duplicate Source Units](#t-out-of-scope-duplicate-source-units)\n        - [Doppelganger Contracts](#t-out-of-scope-doppelganger-contracts)\n- [Report Overview](#t-report)\n    - [Risk Summary](#t-risk)\n    - [Source Lines](#t-source-lines)\n    - [Inline Documentation](#t-inline-documentation)\n    - [Components](#t-components)\n    - [Exposed Functions](#t-exposed-functions)\n    - [StateVariables](#t-statevariables)\n    - [Capabilities](#t-capabilities)\n    - [Dependencies](#t-package-imports)\n    - [Totals](#t-totals)\n\n## <span id=t-scope>Scope</span>\n\nThis section lists files that are in scope for the metrics report. \n\n- **Project:** `\'CLI\'`\n- **Included Files:** \n    - ``\n- **Excluded Paths:** \n    - ``\n- **File Limit:** `undefined`\n    - **Exclude File list Limit:** `undefined`\n\n- **Workspace Repository:** `unknown` (`undefined`@`undefined`)\n\n### <span id=t-source-Units-in-Scope>Source Units in Scope</span>\n\nSource Units Analyzed: **`31`**<br>\nSource Units in Scope: **`31`** (**100%**)\n\n| Type | File   | Logic Contracts | Interfaces | Lines | nLines | nSLOC | Comment Lines | Complex. Score | Capabilities |\n| ---- | ------ | --------------- | ---------- | ----- | ------ | ----- | ------------- | -------------- | ------------ | \n| 📝 | src/arbitration/KlerosCore.sol | 1 | **** | 75 | 63 | 28 | 26 | 13 | **** |\n| 🎨 | src/arbitration/KlerosCoreBase.sol | 1 | **** | 1211 | 1162 | 809 | 286 | 449 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr>** |\n| 📝 | src/arbitration/KlerosCoreNeo.sol | 1 | **** | 142 | 124 | 55 | 51 | 36 | **** |\n| 📝 | src/arbitration/PolicyRegistry.sol | 1 | **** | 88 | 88 | 30 | 41 | 24 | **** |\n| 📝 | src/arbitration/SortitionModule.sol | 1 | **** | 50 | 44 | 15 | 20 | 13 | **** |\n| 🎨 | src/arbitration/SortitionModuleBase.sol | 1 | **** | 689 | 645 | 393 | 205 | 300 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr>** |\n| 📝 | src/arbitration/SortitionModuleNeo.sol | 1 | **** | 103 | 91 | 48 | 28 | 31 | **** |\n| 📝 | src/arbitration/arbitrables/DisputeResolver.sol | 1 | **** | 149 | 134 | 72 | 50 | 43 | **<abbr title=\'Payable Functions\'>💰</abbr>** |\n| 📝 | src/arbitration/DisputeTemplateRegistry.sol | 1 | **** | 83 | 79 | 30 | 33 | 25 | **** |\n| 📝 | src/arbitration/dispute-kits/DisputeKitClassic.sol | 1 | **** | 46 | 46 | 16 | 21 | 13 | **** |\n| 🎨 | src/arbitration/dispute-kits/DisputeKitClassicBase.sol | 1 | **** | 713 | 632 | 365 | 225 | 192 | **<abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr>** |\n| 📝🔍 | src/arbitration/dispute-kits/DisputeKitGated.sol | 1 | 2 | 117 | 99 | 39 | 51 | 57 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'doppelganger(IBalanceHolderERC1155)\'>🔆</abbr>** |\n| 📝🔍 | src/arbitration/dispute-kits/DisputeKitGatedShutter.sol | 1 | 2 | 194 | 159 | 59 | 84 | 69 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr><abbr title=\'doppelganger(IBalanceHolderERC1155)\'>🔆</abbr>** |\n| 📝 | src/arbitration/dispute-kits/DisputeKitShutter.sol | 1 | **** | 123 | 107 | 36 | 54 | 27 | **<abbr title=\'Uses Hash-Functions\'>🧮</abbr>** |\n| 📝🔍 | src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 1 | 1 | 76 | 58 | 20 | 33 | 16 | **<abbr title=\'doppelganger(IProofOfHumanity)\'>🔆</abbr>** |\n| 📝 | src/arbitration/evidence/EvidenceModule.sol | 1 | **** | 70 | 70 | 26 | 30 | 21 | **** |\n| 🔍 | src/arbitration/interfaces/IArbitrableV2.sol | **** | 1 | 40 | 39 | 12 | 22 | 3 | **** |\n| 🔍 | src/arbitration/interfaces/IArbitratorV2.sol | **** | 1 | 83 | 44 | 9 | 50 | 14 | **<abbr title=\'Payable Functions\'>💰</abbr>** |\n| 🔍 | src/arbitration/interfaces/IDisputeKit.sol | **** | 1 | 128 | 39 | 11 | 60 | 23 | **** |\n| 🔍 | src/arbitration/interfaces/IDisputeTemplateRegistry.sol | **** | 1 | 25 | 20 | 9 | 8 | 3 | **** |\n| 🔍 | src/arbitration/interfaces/IEvidence.sol | **** | 1 | 12 | 12 | 4 | 6 | 1 | **** |\n| 🔍 | src/arbitration/interfaces/ISortitionModule.sol | **** | 1 | 63 | 16 | 10 | 4 | 33 | **** |\n|  | src/libraries/Constants.sol | **** | **** | 39 | 39 | 26 | 13 | 2 | **** |\n| 📚 | src/libraries/SafeERC20.sol | 1 | **** | 47 | 47 | 18 | 24 | 12 | **** |\n| 📚🔍 | src/libraries/SafeSend.sol | 1 | 1 | 24 | 19 | 9 | 7 | 15 | **<abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'Initiates ETH Value Transfer\'>📤</abbr>** |\n| 📝 | src/rng/RNGWithFallback.sol | 1 | **** | 103 | 103 | 48 | 41 | 35 | **** |\n| 📝 | src/rng/ChainlinkRNG.sol | 1 | **** | 173 | 173 | 85 | 70 | 50 | **** |\n| 🔍 | src/rng/IRNG.sol | **** | 1 | 13 | 8 | 3 | 5 | 5 | **** |\n| 🎨 | src/proxy/UUPSProxiable.sol | 1 | **** | 140 | 122 | 44 | 71 | 46 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'DelegateCall\'>👥</abbr><abbr title=\'TryCatch Blocks\'>♻️</abbr>** |\n| 📝 | src/proxy/UUPSProxy.sol | 1 | **** | 90 | 90 | 38 | 37 | 65 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'DelegateCall\'>👥</abbr>** |\n| 🎨 | src/proxy/Initializable.sol | 1 | **** | 215 | 215 | 70 | 128 | 31 | **<abbr title=\'Uses Assembly\'>🖥</abbr>** |\n| 📝📚🔍🎨 | **Totals** | **23** | **13** | **5124**  | **4587** | **2437** | **1784** | **1667** | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'Initiates ETH Value Transfer\'>📤</abbr><abbr title=\'DelegateCall\'>👥</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr><abbr title=\'doppelganger\'>🔆</abbr><abbr title=\'TryCatch Blocks\'>♻️</abbr>** |\n\n<sub>\nLegend: <a onclick="toggleVisibility(\'table-legend\', this)">[➕]</a>\n<div id="table-legend" style="display:none">\n\n<ul>\n<li> <b>Lines</b>: total lines of the source unit </li>\n<li> <b>nLines</b>: normalized lines of the source unit (e.g. normalizes functions spanning multiple lines) </li>\n<li> <b>nSLOC</b>: normalized source lines of code (only source-code lines; no comments, no blank lines) </li>\n<li> <b>Comment Lines</b>: lines containing single or block comments </li>\n<li> <b>Complexity Score</b>: a custom complexity score derived from code statements that are known to introduce code complexity (branches, loops, calls, external interfaces, ...) </li>\n</ul>\n\n</div>\n</sub>\n\n\n##### <span id=t-deployable-contracts>Deployable Logic Contracts</span>\nTotal: 16\n* 📝 `KlerosCore`\n* 📝 `KlerosCoreNeo`\n* 📝 `PolicyRegistry`\n* 📝 `SortitionModule`\n* 📝 `SortitionModuleNeo`\n* <a onclick="toggleVisibility(\'deployables\', this)">[➕]</a>\n<div id="deployables" style="display:none">\n<ul>\n<li> 📝 <code>DisputeResolver</code></li>\n<li> 📝 <code>DisputeTemplateRegistry</code></li>\n<li> 📝 <code>DisputeKitClassic</code></li>\n<li> 📝 <code>DisputeKitGated</code></li>\n<li> 📝 <code>DisputeKitGatedShutter</code></li>\n<li> 📝 <code>DisputeKitShutter</code></li>\n<li> 📝 <code>DisputeKitSybilResistant</code></li>\n<li> 📝 <code>EvidenceModule</code></li>\n<li> 📝 <code>RNGWithFallback</code></li>\n<li> 📝 <code>ChainlinkRNG</code></li>\n<li> 📝 <code>UUPSProxy</code></li>\n</ul>\n</div>\n            \n\n\n\n#### <span id=t-out-of-scope>Out of Scope</span>\n\n##### <span id=t-out-of-scope-excluded-source-units>Excluded Source Units</span>\n\nSource Units Excluded: **`0`**\n\n<a onclick="toggleVisibility(\'excluded-files\', this)">[➕]</a>\n<div id="excluded-files" style="display:none">\n| File   |\n| ------ |\n| None |\n\n</div>\n\n\n##### <span id=t-out-of-scope-duplicate-source-units>Duplicate Source Units</span>\n\nDuplicate Source Units Excluded: **`0`** \n\n<a onclick="toggleVisibility(\'duplicate-files\', this)">[➕]</a>\n<div id="duplicate-files" style="display:none">\n| File   |\n| ------ |\n| None |\n\n</div>\n\n##### <span id=t-out-of-scope-doppelganger-contracts>Doppelganger Contracts</span>\n\nDoppelganger Contracts: **`3`** \n\n<a onclick="toggleVisibility(\'doppelganger-contracts\', this)">[➕]</a>\n<div id="doppelganger-contracts" style="display:none">\n| File   | Contract | Doppelganger | \n| ------ | -------- | ------------ |\n| src/arbitration/dispute-kits/DisputeKitGated.sol | IBalanceHolderERC1155 | (fuzzy) [0](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [1](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [2](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [3](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [4](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [5](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [6](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [7](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [8](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-beta.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [9](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [10](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [11](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [12](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.2.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [13](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0/contracts/introspection/IERC1820Implementer.sol), [14](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.0/contracts/drafts/IERC1820Implementer.sol), [15](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.1/contracts/drafts/IERC1820Implementer.sol), [16](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.2/contracts/introspection/IERC1820Implementer.sol), [17](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.3/contracts/introspection/IERC1820Implementer.sol), [18](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0/contracts/introspection/IERC1820Implementer.sol), [19](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [20](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.1/contracts/introspection/IERC1820Implementer.sol), [21](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.2/contracts/introspection/IERC1820Implementer.sol), [22](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [23](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [24](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.1/contracts/introspection/IERC1820Implementer.sol), [25](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0/contracts/introspection/IERC1820Implementer.sol), [26](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [27](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [28](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.1/contracts/introspection/IERC1820Implementer.sol), [29](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.1/contracts/introspection/IERC1820Implementer.sol), [30](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.2/contracts/introspection/IERC1820Implementer.sol), [31](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0/contracts/introspection/IERC1820Implementer.sol), [32](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [33](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0/contracts/introspection/IERC1820Implementer.sol), [34](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [35](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.1-solc-0.7/contracts/introspection/IERC1820Implementer.sol), [36](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820Implementer.sol) |\n| src/arbitration/dispute-kits/DisputeKitGatedShutter.sol | IBalanceHolderERC1155 | (fuzzy) [0](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [1](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [2](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [3](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [4](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [5](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [6](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [7](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [8](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-beta.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [9](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [10](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [11](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [12](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.2.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [13](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0/contracts/introspection/IERC1820Implementer.sol), [14](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.0/contracts/drafts/IERC1820Implementer.sol), [15](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.1/contracts/drafts/IERC1820Implementer.sol), [16](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.2/contracts/introspection/IERC1820Implementer.sol), [17](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.3/contracts/introspection/IERC1820Implementer.sol), [18](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0/contracts/introspection/IERC1820Implementer.sol), [19](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [20](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.1/contracts/introspection/IERC1820Implementer.sol), [21](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.2/contracts/introspection/IERC1820Implementer.sol), [22](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [23](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [24](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.1/contracts/introspection/IERC1820Implementer.sol), [25](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0/contracts/introspection/IERC1820Implementer.sol), [26](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [27](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [28](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.1/contracts/introspection/IERC1820Implementer.sol), [29](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.1/contracts/introspection/IERC1820Implementer.sol), [30](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.2/contracts/introspection/IERC1820Implementer.sol), [31](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0/contracts/introspection/IERC1820Implementer.sol), [32](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [33](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0/contracts/introspection/IERC1820Implementer.sol), [34](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [35](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.1-solc-0.7/contracts/introspection/IERC1820Implementer.sol), [36](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820Implementer.sol) |\n| src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | IProofOfHumanity | (fuzzy) [0](https://github.com/smartcontractkit/chainlink/blob/explorer-v0.8.5/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [1](https://github.com/smartcontractkit/chainlink/blob/upgrade/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [2](https://github.com/smartcontractkit/chainlink/blob/v.0.8.12/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [3](https://github.com/smartcontractkit/chainlink/blob/v0.8.12/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [4](https://github.com/smartcontractkit/chainlink/blob/v0.8.13/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [5](https://github.com/smartcontractkit/chainlink/blob/v0.8.14/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [6](https://github.com/smartcontractkit/chainlink/blob/v0.8.15/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [7](https://github.com/smartcontractkit/chainlink/blob/v0.8.16/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [8](https://github.com/smartcontractkit/chainlink/blob/v0.8.17/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [9](https://github.com/smartcontractkit/chainlink/blob/v0.8.18/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [10](https://github.com/smartcontractkit/chainlink/blob/v0.9.0/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [11](https://github.com/smartcontractkit/chainlink/blob/v0.9.2/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [12](https://github.com/smartcontractkit/chainlink/blob/v0.9.3/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [13](https://github.com/smartcontractkit/chainlink/blob/v0.9.4/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [14](https://github.com/smartcontractkit/chainlink/blob/v0.9.5/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [15](https://github.com/smartcontractkit/chainlink/blob/v0.9.6/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [16](https://github.com/smartcontractkit/chainlink/blob/v0.9.7/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [17](https://github.com/smartcontractkit/chainlink/blob/v0.9.8/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [18](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.0.0/contracts/introspection/IERC165.sol), [19](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.0.1/contracts/introspection/IERC165.sol), [20](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.0.2/contracts/introspection/IERC165.sol), [21](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.1.2/contracts/introspection/IERC165.sol), [22](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.1.3/contracts/introspection/IERC165.sol), [23](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.2.1/contracts/introspection/IERC165.sol), [24](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.2.2/contracts/introspection/IERC165.sol), [25](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.2.3/contracts/introspection/IERC165.sol), [26](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.5.0/contracts/introspection/IERC165.sol), [27](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.0/contracts/introspection/IERC165Upgradeable.sol), [28](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.2-solc-0.7/contracts/introspection/IERC165Upgradeable.sol), [29](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0/contracts/introspection/IERC165Upgradeable.sol), [30](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0-solc-0.7/contracts/introspection/IERC165Upgradeable.sol), [31](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0/contracts/introspection/IERC165Upgradeable.sol), [32](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0-solc-0.7/contracts/introspection/IERC165Upgradeable.sol), [33](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0/contracts/utils/introspection/IERC165Upgradeable.sol), [34](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-beta.0/contracts/utils/introspection/IERC165Upgradeable.sol), [35](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-rc.0/contracts/utils/introspection/IERC165Upgradeable.sol), [36](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0/contracts/utils/introspection/IERC165Upgradeable.sol), [37](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0-rc.0/contracts/utils/introspection/IERC165Upgradeable.sol), [38](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.2.0/contracts/utils/introspection/IERC165Upgradeable.sol), [39](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0/contracts/introspection/IERC165.sol), [40](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.1/contracts/introspection/IERC165.sol), [41](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.2/contracts/introspection/IERC165.sol), [42](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.3/contracts/introspection/IERC165.sol), [43](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.4/contracts/introspection/IERC165.sol), [44](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.1/contracts/introspection/IERC165.sol), [45](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.0-rc.1/contracts/introspection/IERC165.sol), [46](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.0-rc.2/contracts/introspection/IERC165.sol), [47](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.1/contracts/introspection/IERC165.sol), [48](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.2/contracts/introspection/IERC165.sol), [49](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.3/contracts/introspection/IERC165.sol), [50](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.2.0/contracts/introspection/IERC165.sol), [51](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.2.0-rc.1/contracts/introspection/IERC165.sol), [52](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0/contracts/introspection/IERC165.sol), [53](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.0/contracts/introspection/IERC165.sol), [54](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.1/contracts/introspection/IERC165.sol), [55](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.2/contracts/introspection/IERC165.sol), [56](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.3/contracts/introspection/IERC165.sol), [57](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0/contracts/introspection/IERC165.sol), [58](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.0/contracts/introspection/IERC165.sol), [59](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.1/contracts/introspection/IERC165.sol), [60](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.2/contracts/introspection/IERC165.sol), [61](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0/contracts/introspection/IERC165.sol), [62](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0-rc.0/contracts/introspection/IERC165.sol), [63](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.1/contracts/introspection/IERC165.sol), [64](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0/contracts/introspection/IERC165.sol), [65](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-beta.0/contracts/introspection/IERC165.sol), [66](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.0/contracts/introspection/IERC165.sol), [67](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.1/contracts/introspection/IERC165.sol), [68](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.1/contracts/introspection/IERC165.sol), [69](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.2/contracts/introspection/IERC165.sol), [70](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0/contracts/introspection/IERC165.sol), [71](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0-rc.0/contracts/introspection/IERC165.sol), [72](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0/contracts/introspection/IERC165.sol), [73](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0-rc.0/contracts/introspection/IERC165.sol), [74](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.1-solc-0.7/contracts/introspection/IERC165.sol), [75](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.2-solc-0.7/contracts/introspection/IERC165.sol) |\n\n</div>\n\n\n## <span id=t-report>Report</span>\n\n### Overview\n\nThe analysis finished with **`0`** errors and **`0`** duplicate files.\n\n\n\n\n\n#### <span id=t-risk>Risk</span>\n\n<div class="wrapper" style="max-width: 512px; margin: auto">\n\t\t\t<canvas id="chart-risk-summary"></canvas>\n</div>\n\n#### <span id=t-source-lines>Source Lines (sloc vs. nsloc)</span>\n\n<div class="wrapper" style="max-width: 512px; margin: auto">\n    <canvas id="chart-nsloc-total"></canvas>\n</div>\n\n#### <span id=t-inline-documentation>Inline Documentation</span>\n\n- **Comment-to-Source Ratio:** On average there are`1.59` code lines per comment (lower=better).\n- **ToDo\'s:** `2` \n\n#### <span id=t-components>Components</span>\n\n| 📝Contracts   | 📚Libraries | 🔍Interfaces | 🎨Abstract |\n| ------------- | ----------- | ------------ | ---------- |\n| 16 | 2  | 13  | 5 |\n\n#### <span id=t-exposed-functions>Exposed Functions</span>\n\nThis section lists functions that are explicitly declared public or payable. Please note that getter methods for public stateVars are not included.  \n\n| 🌐Public   | 💰Payable |\n| ---------- | --------- |\n| 192 | 10  | \n\n| External   | Internal | Private | Pure | View |\n| ---------- | -------- | ------- | ---- | ---- |\n| 175 | 217  | 2 | 13 | 80 |\n\n#### <span id=t-statevariables>StateVariables</span>\n\n| Total      | 🌐Public  |\n| ---------- | --------- |\n| 87  | 80 |\n\n#### <span id=t-capabilities>Capabilities</span>\n\n| Solidity Versions observed | 🧪 Experimental Features | 💰 Can Receive Funds | 🖥 Uses Assembly | 💣 Has Destroyable Contracts | \n| -------------------------- | ------------------------ | -------------------- | ---------------- | ---------------------------- |\n| `^0.8.24`<br/>`>=0.8.0 <0.9.0` |  | `yes` | `yes` <br/>(12 asm blocks) | **** | \n\n| 📤 Transfers ETH | ⚡ Low-Level Calls | 👥 DelegateCall | 🧮 Uses Hash Functions | 🔖 ECRecover | 🌀 New/Create/Create2 |\n| ---------------- | ----------------- | --------------- | ---------------------- | ------------ | --------------------- |\n| `yes` | **** | `yes` | `yes` | **** | **** | \n\n| ♻️ TryCatch | Σ Unchecked |\n| ---------- | ----------- |\n| `yes` | **** |\n\n#### <span id=t-package-imports>Dependencies / External Imports</span>\n\n| Dependency / Import Path | Count  | \n| ------------------------ | ------ |\n| @chainlink/contracts/src/v0.8/vrf/dev/VRFConsumerBaseV2Plus.sol | 1 |\n| @chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol | 1 |\n| @openzeppelin/contracts/token/ERC20/IERC20.sol | 3 |\n| @openzeppelin/contracts/token/ERC721/IERC721.sol | 1 |\n\n#### <span id=t-totals>Totals</span>\n\n##### Summary\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar"></canvas>\n</div>\n\n##### AST Node Statistics\n\n###### Function Calls\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar-ast-funccalls"></canvas>\n</div>\n\n###### Assembly Calls\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar-ast-asmcalls"></canvas>\n</div>\n\n###### AST Total\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar-ast"></canvas>\n</div>\n\n##### Inheritance Graph\n\n<a onclick="toggleVisibility(\'surya-inherit\', this)">[➕]</a>\n<div id="surya-inherit" style="display:none">\n<div class="wrapper" style="max-width: 512px; margin: auto">\n    <div id="surya-inheritance" style="text-align: center;"></div> \n</div>\n</div>\n\n##### CallGraph\n\n<a onclick="toggleVisibility(\'surya-call\', this)">[➕]</a>\n<div id="surya-call" style="display:none">\n<div class="wrapper" style="max-width: 512px; margin: auto">\n    <div id="surya-callgraph" style="text-align: center;"></div>\n</div>\n</div>\n\n###### Contract Summary\n\n<a onclick="toggleVisibility(\'surya-mdreport\', this)">[➕]</a>\n<div id="surya-mdreport" style="display:none">\n \n\n Files Description Table\n\n\n|  File Name  |  SHA-1 Hash  |\n|-------------|--------------|\n| src/arbitration/KlerosCore.sol | 5362842ab3a88870e8b3b42cd7cf7a2058240483 |\n| src/arbitration/KlerosCoreBase.sol | fe829c80ad434e185151a8b5d299a585f576c619 |\n| src/arbitration/KlerosCoreNeo.sol | 0260ef7a9309d5c73c4c9b1a3f5c7653904f79c7 |\n| src/arbitration/PolicyRegistry.sol | c36299120ac7318dd29e4ab86f50b0447d87af96 |\n| src/arbitration/SortitionModule.sol | c1c1b2dd061590cd6c7eee41767e5c3fb898d506 |\n| src/arbitration/SortitionModuleBase.sol | 7b1037fcdfffc58bf3522f70ed128cad4915e032 |\n| src/arbitration/SortitionModuleNeo.sol | 8570ebeff10d723ce33b75e077dffb6fcf6e2f08 |\n| src/arbitration/arbitrables/DisputeResolver.sol | 7dad21f0219e0a1b698859205bbf31b07abfdc7c |\n| src/arbitration/DisputeTemplateRegistry.sol | c31e000957b979dc513d8b123253adb9edce50c7 |\n| src/arbitration/dispute-kits/DisputeKitClassic.sol | 32bcb287571a3c4a861659be31a1ee2dc6ea6784 |\n| src/arbitration/dispute-kits/DisputeKitClassicBase.sol | 7c0b04f3e73c0a10a29abfa78f78220e4e43f983 |\n| src/arbitration/dispute-kits/DisputeKitGated.sol | e5f7f2ecd65f5e279c7b55e9edbe6f4cfc5fd632 |\n| src/arbitration/dispute-kits/DisputeKitGatedShutter.sol | abb7f1ac20fa60db95d97fea6e9396b108d40924 |\n| src/arbitration/dispute-kits/DisputeKitShutter.sol | 3720b60db303b866eacbb3dee529a638eaf6782e |\n| src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 69158bf07e78b3cb9892a5fd6cfc768181989a7f |\n| src/arbitration/evidence/EvidenceModule.sol | 45845f3d5ad5548a30698105061bc0e64fd7718f |\n| src/arbitration/interfaces/IArbitrableV2.sol | ce54b7140a6109b2d919cea38ff94ac2ad775398 |\n| src/arbitration/interfaces/IArbitratorV2.sol | 4e0baa0ff6155737540105f9fdb5b54ba2905d2c |\n| src/arbitration/interfaces/IDisputeKit.sol | f21b52ed28a905b3073adaf68961938200cfd644 |\n| src/arbitration/interfaces/IDisputeTemplateRegistry.sol | 8d0351ebeee1ebd8603af9cf50c2ab62f6e8fecb |\n| src/arbitration/interfaces/IEvidence.sol | 12ee130f67f5d38afbcc810129b030cf7f58f058 |\n| src/arbitration/interfaces/ISortitionModule.sol | 2c6d74752298263f7c649e3feecfb9a03c87a16a |\n| src/libraries/Constants.sol | 4d1d44dbeeda03f47a646e9552873d26acf4254d |\n| src/libraries/SafeERC20.sol | 68e49603280eab2b68eabc554dc310ff3313a64c |\n| src/libraries/SafeSend.sol | 9d282cf6456950471debec28103fcb99638fa83d |\n| src/rng/RNGWithFallback.sol | 9729dbce3e1dd5981073df38ac31fe356aae0027 |\n| src/rng/ChainlinkRNG.sol | ce0d145807bc7b5b59b0e29ba468d9b0c0dc0314 |\n| src/rng/IRNG.sol | d701581ef4910cdde9dbc3006dd0229cc3ea6012 |\n| src/proxy/UUPSProxiable.sol | 80d46ace20ea4c9c6a0cbc1093d6e88eb19aeb12 |\n| src/proxy/UUPSProxy.sol | 18a2a570a8ef2ec5f02d59bd1c03a176203e8ccf |\n| src/proxy/Initializable.sol | 7079462341810d12b0c0ea93845d053bdcbdabff |\n\n\n Contracts Description Table\n\n\n|  Contract  |         Type        |       Bases      |                  |                 |\n|:----------:|:-------------------:|:----------------:|:----------------:|:---------------:|\n|     └      |  **Function Name**  |  **Visibility**  |  **Mutability**  |  **Modifiers**  |\n||||||\n| **KlerosCore** | Implementation | KlerosCoreBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | reinitialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n||||||\n| **KlerosCoreBase** | Implementation | IArbitratorV2, Initializable, UUPSProxiable |||\n| └ | __KlerosCoreBase_initialize | Internal 🔒 | 🛑  | onlyInitializing |\n| └ | pause | External ❗️ | 🛑  | onlyByGuardianOrGovernor whenNotPaused |\n| └ | unpause | External ❗️ | 🛑  | onlyByGovernor whenPaused |\n| └ | executeGovernorProposal | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeGuardian | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changePinakion | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeJurorProsecutionModule | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeSortitionModule | External ❗️ | 🛑  | onlyByGovernor |\n| └ | addNewDisputeKit | External ❗️ | 🛑  | onlyByGovernor |\n| └ | createCourt | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeCourtParameters | External ❗️ | 🛑  | onlyByGovernor |\n| └ | enableDisputeKits | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeAcceptedFeeTokens | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeCurrencyRates | External ❗️ | 🛑  | onlyByGovernor |\n| └ | setStake | External ❗️ | 🛑  | whenNotPaused |\n| └ | setStakeBySortitionModule | External ❗️ | 🛑  |NO❗️ |\n| └ | transferBySortitionModule | External ❗️ | 🛑  |NO❗️ |\n| └ | createDispute | External ❗️ |  💵 |NO❗️ |\n| └ | createDispute | External ❗️ | 🛑  |NO❗️ |\n| └ | _createDispute | Internal 🔒 | 🛑  | |\n| └ | passPeriod | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | External ❗️ | 🛑  |NO❗️ |\n| └ | appeal | External ❗️ |  💵 |NO❗️ |\n| └ | execute | External ❗️ | 🛑  | whenNotPaused |\n| └ | _executePenalties | Internal 🔒 | 🛑  | |\n| └ | _executeRewards | Internal 🔒 | 🛑  | |\n| └ | executeRuling | External ❗️ | 🛑  |NO❗️ |\n| └ | arbitrationCost | Public ❗️ |   |NO❗️ |\n| └ | arbitrationCost | Public ❗️ |   |NO❗️ |\n| └ | appealCost | Public ❗️ |   |NO❗️ |\n| └ | appealPeriod | External ❗️ |   |NO❗️ |\n| └ | currentRuling | Public ❗️ |   |NO❗️ |\n| └ | getRoundInfo | External ❗️ |   |NO❗️ |\n| └ | getPnkAtStakePerJuror | External ❗️ |   |NO❗️ |\n| └ | getNumberOfRounds | External ❗️ |   |NO❗️ |\n| └ | isSupported | External ❗️ |   |NO❗️ |\n| └ | getTimesPerPeriod | External ❗️ |   |NO❗️ |\n| └ | getNumberOfVotes | External ❗️ |   |NO❗️ |\n| └ | isDisputeKitJumping | External ❗️ |   |NO❗️ |\n| └ | getDisputeKitsLength | External ❗️ |   |NO❗️ |\n| └ | convertEthToTokenAmount | Public ❗️ |   |NO❗️ |\n| └ | _transferFeeToken | Internal 🔒 | 🛑  | |\n| └ | _applyCoherence | Internal 🔒 |   | |\n| └ | _calculatePnkAtStake | Internal 🔒 |   | |\n| └ | _enableDisputeKit | Internal 🔒 | 🛑  | |\n| └ | _setStake | Internal 🔒 | 🛑  | |\n| └ | _stakingFailed | Internal 🔒 |   | |\n| └ | _extraDataToCourtIDMinJurorsDisputeKit | Internal 🔒 |   | |\n||||||\n| **KlerosCoreNeo** | Implementation | KlerosCoreBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | reinitialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | changeJurorNft | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeArbitrableWhitelist | External ❗️ | 🛑  | onlyByGovernor |\n| └ | setStake | External ❗️ | 🛑  | whenNotPaused |\n| └ | _createDispute | Internal 🔒 | 🛑  | |\n| └ | _stakingFailed | Internal 🔒 |   | |\n||||||\n| **PolicyRegistry** | Implementation | UUPSProxiable, Initializable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | initialize2 | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | setPolicy | External ❗️ | 🛑  | onlyByGovernor |\n||||||\n| **SortitionModule** | Implementation | SortitionModuleBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | initialize4 | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n||||||\n| **SortitionModuleBase** | Implementation | ISortitionModule, Initializable, UUPSProxiable |||\n| └ | __SortitionModuleBase_initialize | Internal 🔒 | 🛑  | onlyInitializing |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeMinStakingTime | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeMaxDrawingTime | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeRandomNumberGenerator | External ❗️ | 🛑  | onlyByGovernor |\n| └ | passPhase | External ❗️ | 🛑  |NO❗️ |\n| └ | createTree | External ❗️ | 🛑  | onlyByCore |\n| └ | executeDelayedStakes | External ❗️ | 🛑  |NO❗️ |\n| └ | createDisputeHook | External ❗️ | 🛑  | onlyByCore |\n| └ | postDrawHook | External ❗️ | 🛑  | onlyByCore |\n| └ | notifyRandomNumber | Public ❗️ | 🛑  |NO❗️ |\n| └ | validateStake | External ❗️ | 🛑  | onlyByCore |\n| └ | _validateStake | Internal 🔒 | 🛑  | |\n| └ | setStake | External ❗️ | 🛑  | onlyByCore |\n| └ | _setStake | Internal 🔒 | 🛑  | |\n| └ | lockStake | External ❗️ | 🛑  | onlyByCore |\n| └ | unlockStake | External ❗️ | 🛑  | onlyByCore |\n| └ | penalizeStake | External ❗️ | 🛑  | onlyByCore |\n| └ | setJurorInactive | External ❗️ | 🛑  | onlyByCore |\n| └ | withdrawLeftoverPNK | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | Public ❗️ |   |NO❗️ |\n| └ | stakeOf | Public ❗️ |   |NO❗️ |\n| └ | stakeOf | Public ❗️ |   |NO❗️ |\n| └ | getJurorBalance | External ❗️ |   |NO❗️ |\n| └ | getJurorCourtIDs | Public ❗️ |   |NO❗️ |\n| └ | isJurorStaked | External ❗️ |   |NO❗️ |\n| └ | getJurorLeftoverPNK | Public ❗️ |   |NO❗️ |\n| └ | _updateParents | Private 🔐 | 🛑  | |\n| └ | _stakePathIDToAccount | Internal 🔒 |   | |\n| └ | _extraDataToTreeK | Internal 🔒 |   | |\n| └ | _set | Internal 🔒 | 🛑  | |\n| └ | _accountAndCourtIDToStakePathID | Internal 🔒 |   | |\n||||||\n| **SortitionModuleNeo** | Implementation | SortitionModuleBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | initialize4 | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | changeMaxStakePerJuror | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeMaxTotalStaked | External ❗️ | 🛑  | onlyByGovernor |\n| └ | _validateStake | Internal 🔒 | 🛑  | onlyByCore |\n||||||\n| **DisputeResolver** | Implementation | IArbitrableV2 |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | changeGovernor | External ❗️ | 🛑  |NO❗️ |\n| └ | changeArbitrator | External ❗️ | 🛑  |NO❗️ |\n| └ | changeTemplateRegistry | External ❗️ | 🛑  |NO❗️ |\n| └ | createDisputeForTemplate | External ❗️ |  💵 |NO❗️ |\n| └ | createDisputeForTemplateUri | External ❗️ |  💵 |NO❗️ |\n| └ | rule | External ❗️ | 🛑  |NO❗️ |\n| └ | _createDispute | Internal 🔒 | 🛑  | |\n||||||\n| **DisputeTemplateRegistry** | Implementation | IDisputeTemplateRegistry, UUPSProxiable, Initializable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | initialize2 | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | setDisputeTemplate | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **DisputeKitClassic** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | reinitialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n||||||\n| **DisputeKitClassicBase** | Implementation | IDisputeKit, Initializable, UUPSProxiable |||\n| └ | __DisputeKitClassicBase_initialize | Internal 🔒 | 🛑  | onlyInitializing |\n| └ | executeGovernorProposal | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeCore | External ❗️ | 🛑  | onlyByGovernor |\n| └ | createDispute | External ❗️ | 🛑  | onlyByCore |\n| └ | draw | External ❗️ | 🛑  | onlyByCore notJumped |\n| └ | castCommit | External ❗️ | 🛑  |NO❗️ |\n| └ | _castCommit | Internal 🔒 | 🛑  | notJumped |\n| └ | castVote | External ❗️ | 🛑  |NO❗️ |\n| └ | _castVote | Internal 🔒 | 🛑  | notJumped |\n| └ | fundAppeal | External ❗️ |  💵 | notJumped |\n| └ | withdrawFeesAndRewards | External ❗️ | 🛑  |NO❗️ |\n| └ | hashVote | Public ❗️ |   |NO❗️ |\n| └ | getFundedChoices | Public ❗️ |   |NO❗️ |\n| └ | currentRuling | External ❗️ |   |NO❗️ |\n| └ | getDegreeOfCoherence | External ❗️ |   |NO❗️ |\n| └ | getCoherentCount | External ❗️ |   |NO❗️ |\n| └ | areCommitsAllCast | External ❗️ |   |NO❗️ |\n| └ | areVotesAllCast | External ❗️ |   |NO❗️ |\n| └ | isAppealFunded | External ❗️ |   |NO❗️ |\n| └ | isVoteActive | External ❗️ |   |NO❗️ |\n| └ | getRoundInfo | External ❗️ |   |NO❗️ |\n| └ | getNumberOfRounds | External ❗️ |   |NO❗️ |\n| └ | getLocalDisputeRoundID | External ❗️ |   |NO❗️ |\n| └ | getVoteInfo | External ❗️ |   |NO❗️ |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **IBalanceHolder** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **IBalanceHolderERC1155** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **DisputeKitGated** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | reinitialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | extraDataToTokenInfo | Public ❗️ |   |NO❗️ |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **IBalanceHolder** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **IBalanceHolderERC1155** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **DisputeKitGatedShutter** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | reinitialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | castCommitShutter | External ❗️ | 🛑  | notJumped |\n| └ | castVoteShutter | External ❗️ | 🛑  |NO❗️ |\n| └ | hashVote | Public ❗️ |   |NO❗️ |\n| └ | _extraDataToTokenInfo | Internal 🔒 |   | |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **DisputeKitShutter** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | reinitialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | castCommitShutter | External ❗️ | 🛑  | notJumped |\n| └ | castVoteShutter | External ❗️ | 🛑  |NO❗️ |\n| └ | hashVote | Public ❗️ |   |NO❗️ |\n||||||\n| **IProofOfHumanity** | Interface |  |||\n| └ | isRegistered | External ❗️ |   |NO❗️ |\n||||||\n| **DisputeKitSybilResistant** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **EvidenceModule** | Implementation | IEvidence, Initializable, UUPSProxiable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | reinitializer |\n| └ | initialize2 | External ❗️ | 🛑  | reinitializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByGovernor |\n| └ | submitEvidence | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **IArbitrableV2** | Interface |  |||\n| └ | rule | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **IArbitratorV2** | Interface |  |||\n| └ | createDispute | External ❗️ |  💵 |NO❗️ |\n| └ | createDispute | External ❗️ | 🛑  |NO❗️ |\n| └ | arbitrationCost | External ❗️ |   |NO❗️ |\n| └ | arbitrationCost | External ❗️ |   |NO❗️ |\n| └ | currentRuling | External ❗️ |   |NO❗️ |\n||||||\n| **IDisputeKit** | Interface |  |||\n| └ | createDispute | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | External ❗️ | 🛑  |NO❗️ |\n| └ | currentRuling | External ❗️ |   |NO❗️ |\n| └ | getDegreeOfCoherence | External ❗️ |   |NO❗️ |\n| └ | getCoherentCount | External ❗️ |   |NO❗️ |\n| └ | areCommitsAllCast | External ❗️ |   |NO❗️ |\n| └ | areVotesAllCast | External ❗️ |   |NO❗️ |\n| └ | isAppealFunded | External ❗️ |   |NO❗️ |\n| └ | isVoteActive | External ❗️ |   |NO❗️ |\n| └ | getRoundInfo | External ❗️ |   |NO❗️ |\n| └ | getVoteInfo | External ❗️ |   |NO❗️ |\n||||||\n| **IDisputeTemplateRegistry** | Interface |  |||\n| └ | setDisputeTemplate | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **IEvidence** | Interface |  |||\n||||||\n| **ISortitionModule** | Interface |  |||\n| └ | createTree | External ❗️ | 🛑  |NO❗️ |\n| └ | validateStake | External ❗️ | 🛑  |NO❗️ |\n| └ | setStake | External ❗️ | 🛑  |NO❗️ |\n| └ | setJurorInactive | External ❗️ | 🛑  |NO❗️ |\n| └ | lockStake | External ❗️ | 🛑  |NO❗️ |\n| └ | unlockStake | External ❗️ | 🛑  |NO❗️ |\n| └ | penalizeStake | External ❗️ | 🛑  |NO❗️ |\n| └ | notifyRandomNumber | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | External ❗️ |   |NO❗️ |\n| └ | getJurorBalance | External ❗️ |   |NO❗️ |\n| └ | getJurorCourtIDs | External ❗️ |   |NO❗️ |\n| └ | isJurorStaked | External ❗️ |   |NO❗️ |\n| └ | getJurorLeftoverPNK | External ❗️ |   |NO❗️ |\n| └ | createDisputeHook | External ❗️ | 🛑  |NO❗️ |\n| └ | postDrawHook | External ❗️ | 🛑  |NO❗️ |\n| └ | withdrawLeftoverPNK | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **SafeERC20** | Library |  |||\n| └ | increaseAllowance | Internal 🔒 | 🛑  | |\n| └ | safeTransfer | Internal 🔒 | 🛑  | |\n| └ | safeTransferFrom | Internal 🔒 | 🛑  | |\n||||||\n| **WethLike** | Interface |  |||\n| └ | deposit | External ❗️ |  💵 |NO❗️ |\n| └ | transfer | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **SafeSend** | Library |  |||\n| └ | safeSend | Internal 🔒 | 🛑  | |\n||||||\n| **RNGWithFallback** | Implementation | IRNG |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeConsumer | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeFallbackTimeout | External ❗️ | 🛑  | onlyByGovernor |\n| └ | requestRandomness | External ❗️ | 🛑  | onlyByConsumer |\n| └ | receiveRandomness | External ❗️ | 🛑  | onlyByConsumer |\n||||||\n| **ChainlinkRNG** | Implementation | IRNG, VRFConsumerBaseV2Plus |||\n| └ | <Constructor> | Public ❗️ | 🛑  | VRFConsumerBaseV2Plus |\n| └ | changeGovernor | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeConsumer | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeVrfCoordinator | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeKeyHash | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeSubscriptionId | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeRequestConfirmations | External ❗️ | 🛑  | onlyByGovernor |\n| └ | changeCallbackGasLimit | External ❗️ | 🛑  | onlyByGovernor |\n| └ | requestRandomness | External ❗️ | 🛑  | onlyByConsumer |\n| └ | fulfillRandomWords | Internal 🔒 | 🛑  | |\n| └ | receiveRandomness | External ❗️ |   |NO❗️ |\n||||||\n| **IRNG** | Interface |  |||\n| └ | requestRandomness | External ❗️ | 🛑  |NO❗️ |\n| └ | receiveRandomness | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **UUPSProxiable** | Implementation |  |||\n| └ | _authorizeUpgrade | Internal 🔒 | 🛑  | |\n| └ | upgradeToAndCall | Public ❗️ |  💵 |NO❗️ |\n| └ | proxiableUUID | External ❗️ |   |NO❗️ |\n| └ | version | External ❗️ |   |NO❗️ |\n| └ | _getImplementation | Internal 🔒 |   | |\n||||||\n| **UUPSProxy** | Implementation |  |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | _delegate | Internal 🔒 | 🛑  | |\n| └ | _getImplementation | Internal 🔒 |   | |\n| └ | <Fallback> | External ❗️ |  💵 |NO❗️ |\n| └ | <Receive Ether> | External ❗️ |  💵 |NO❗️ |\n||||||\n| **Initializable** | Implementation |  |||\n| └ | _checkInitializing | Internal 🔒 |   | |\n| └ | _disableInitializers | Internal 🔒 | 🛑  | |\n| └ | _getInitializedVersion | Internal 🔒 |   | |\n| └ | _isInitializing | Internal 🔒 |   | |\n| └ | _getInitializableStorage | Private 🔐 |   | |\n\n\n Legend\n\n|  Symbol  |  Meaning  |\n|:--------:|-----------|\n|    🛑    | Function can modify state |\n|    💵    | Function is payable |\n \n\n</div>\n____\n<sub>\nThinking about smart contract security? We can provide training, ongoing advice, and smart contract auditing. [Contact us](https://consensys.io/diligence/contact/).\n</sub>\n\n',
+          '\n[<img width="200" alt="get in touch with Consensys Diligence" src="https://user-images.githubusercontent.com/2865694/56826101-91dcf380-685b-11e9-937c-af49c2510aa0.png">](https://consensys.io/diligence)<br/>\n<sup>\n[[  🌐  ](https://consensys.io/diligence)  [  📩  ](mailto:diligence@consensys.net)  [  🔥  ](https://consensys.io/diligence/tools/)]\n</sup><br/><br/>\n\n\n\n# Solidity Metrics for \'CLI\'\n\n## Table of contents\n\n- [Scope](#t-scope)\n    - [Source Units in Scope](#t-source-Units-in-Scope)\n        - [Deployable Logic Contracts](#t-deployable-contracts)\n    - [Out of Scope](#t-out-of-scope)\n        - [Excluded Source Units](#t-out-of-scope-excluded-source-units)\n        - [Duplicate Source Units](#t-out-of-scope-duplicate-source-units)\n        - [Doppelganger Contracts](#t-out-of-scope-doppelganger-contracts)\n- [Report Overview](#t-report)\n    - [Risk Summary](#t-risk)\n    - [Source Lines](#t-source-lines)\n    - [Inline Documentation](#t-inline-documentation)\n    - [Components](#t-components)\n    - [Exposed Functions](#t-exposed-functions)\n    - [StateVariables](#t-statevariables)\n    - [Capabilities](#t-capabilities)\n    - [Dependencies](#t-package-imports)\n    - [Totals](#t-totals)\n\n## <span id=t-scope>Scope</span>\n\nThis section lists files that are in scope for the metrics report. \n\n- **Project:** `\'CLI\'`\n- **Included Files:** \n    - ``\n- **Excluded Paths:** \n    - ``\n- **File Limit:** `undefined`\n    - **Exclude File list Limit:** `undefined`\n\n- **Workspace Repository:** `unknown` (`undefined`@`undefined`)\n\n### <span id=t-source-Units-in-Scope>Source Units in Scope</span>\n\nSource Units Analyzed: **`27`**<br>\nSource Units in Scope: **`27`** (**100%**)\n\n| Type | File   | Logic Contracts | Interfaces | Lines | nLines | nSLOC | Comment Lines | Complex. Score | Capabilities |\n| ---- | ------ | --------------- | ---------- | ----- | ------ | ----- | ------------- | -------------- | ------------ | \n| 📝 | src/arbitration/KlerosCore.sol | 1 | **** | 1333 | 1272 | 869 | 322 | 486 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr>** |\n| 📝 | src/arbitration/PolicyRegistry.sol | 1 | **** | 90 | 90 | 29 | 43 | 22 | **** |\n| 📝 | src/arbitration/SortitionModule.sol | 1 | **** | 622 | 572 | 325 | 208 | 223 | **<abbr title=\'Uses Assembly\'>🖥</abbr>** |\n| 📝 | src/arbitration/arbitrables/DisputeResolver.sol | 1 | **** | 159 | 144 | 77 | 53 | 50 | **<abbr title=\'Payable Functions\'>💰</abbr>** |\n| 📝 | src/arbitration/DisputeTemplateRegistry.sol | 1 | **** | 85 | 81 | 29 | 35 | 23 | **** |\n| 📝 | src/arbitration/dispute-kits/DisputeKitClassic.sol | 1 | **** | 48 | 43 | 13 | 22 | 10 | **** |\n| 🎨 | src/arbitration/dispute-kits/DisputeKitClassicBase.sol | 1 | **** | 800 | 705 | 407 | 253 | 228 | **<abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr>** |\n| 📝🔍 | src/arbitration/dispute-kits/DisputeKitGated.sol | 1 | 2 | 119 | 96 | 36 | 52 | 54 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'doppelganger(IBalanceHolderERC1155)\'>🔆</abbr>** |\n| 📝🔍 | src/arbitration/dispute-kits/DisputeKitGatedShutter.sol | 1 | 2 | 256 | 211 | 81 | 104 | 80 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr><abbr title=\'doppelganger(IBalanceHolderERC1155)\'>🔆</abbr>** |\n| 📝 | src/arbitration/dispute-kits/DisputeKitShutter.sol | 1 | **** | 189 | 163 | 58 | 77 | 38 | **<abbr title=\'Uses Hash-Functions\'>🧮</abbr>** |\n| 📝🔍 | src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 1 | 1 | 78 | 59 | 20 | 34 | 16 | **<abbr title=\'doppelganger(IProofOfHumanity)\'>🔆</abbr>** |\n| 📝 | src/arbitration/evidence/EvidenceModule.sol | 1 | **** | 72 | 72 | 25 | 32 | 19 | **** |\n| 🔍 | src/arbitration/interfaces/IArbitrableV2.sol | **** | 1 | 40 | 39 | 12 | 22 | 3 | **** |\n| 🔍 | src/arbitration/interfaces/IArbitratorV2.sol | **** | 1 | 83 | 44 | 9 | 50 | 14 | **<abbr title=\'Payable Functions\'>💰</abbr>** |\n| 🔍 | src/arbitration/interfaces/IDisputeKit.sol | **** | 1 | 165 | 39 | 11 | 78 | 31 | **** |\n| 🔍 | src/arbitration/interfaces/IDisputeTemplateRegistry.sol | **** | 1 | 25 | 20 | 9 | 8 | 3 | **** |\n| 🔍 | src/arbitration/interfaces/IEvidence.sol | **** | 1 | 12 | 12 | 4 | 6 | 1 | **** |\n| 🔍 | src/arbitration/interfaces/ISortitionModule.sol | **** | 1 | 73 | 16 | 10 | 4 | 37 | **** |\n|  | src/libraries/Constants.sol | **** | **** | 42 | 42 | 27 | 14 | 2 | **** |\n| 📚 | src/libraries/SafeERC20.sol | 1 | **** | 47 | 47 | 18 | 24 | 12 | **** |\n| 📚🔍 | src/libraries/SafeSend.sol | 1 | 1 | 24 | 19 | 9 | 7 | 15 | **<abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'Initiates ETH Value Transfer\'>📤</abbr>** |\n| 📝 | src/rng/RNGWithFallback.sol | 1 | **** | 109 | 109 | 49 | 44 | 38 | **** |\n| 📝 | src/rng/ChainlinkRNG.sol | 1 | **** | 171 | 171 | 83 | 69 | 51 | **** |\n| 🔍 | src/rng/IRNG.sol | **** | 1 | 16 | 8 | 3 | 5 | 5 | **** |\n| 🎨 | src/proxy/UUPSProxiable.sol | 1 | **** | 140 | 122 | 44 | 71 | 46 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'DelegateCall\'>👥</abbr><abbr title=\'TryCatch Blocks\'>♻️</abbr>** |\n| 📝 | src/proxy/UUPSProxy.sol | 1 | **** | 90 | 90 | 38 | 37 | 65 | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'DelegateCall\'>👥</abbr>** |\n| 🎨 | src/proxy/Initializable.sol | 1 | **** | 215 | 215 | 70 | 128 | 31 | **<abbr title=\'Uses Assembly\'>🖥</abbr>** |\n| 📝📚🔍🎨 | **Totals** | **19** | **13** | **5103**  | **4501** | **2365** | **1802** | **1603** | **<abbr title=\'Uses Assembly\'>🖥</abbr><abbr title=\'Payable Functions\'>💰</abbr><abbr title=\'Initiates ETH Value Transfer\'>📤</abbr><abbr title=\'DelegateCall\'>👥</abbr><abbr title=\'Uses Hash-Functions\'>🧮</abbr><abbr title=\'doppelganger\'>🔆</abbr><abbr title=\'TryCatch Blocks\'>♻️</abbr>** |\n\n<sub>\nLegend: <a onclick="toggleVisibility(\'table-legend\', this)">[➕]</a>\n<div id="table-legend" style="display:none">\n\n<ul>\n<li> <b>Lines</b>: total lines of the source unit </li>\n<li> <b>nLines</b>: normalized lines of the source unit (e.g. normalizes functions spanning multiple lines) </li>\n<li> <b>nSLOC</b>: normalized source lines of code (only source-code lines; no comments, no blank lines) </li>\n<li> <b>Comment Lines</b>: lines containing single or block comments </li>\n<li> <b>Complexity Score</b>: a custom complexity score derived from code statements that are known to introduce code complexity (branches, loops, calls, external interfaces, ...) </li>\n</ul>\n\n</div>\n</sub>\n\n\n##### <span id=t-deployable-contracts>Deployable Logic Contracts</span>\nTotal: 14\n* 📝 `KlerosCore`\n* 📝 `PolicyRegistry`\n* 📝 `SortitionModule`\n* 📝 `DisputeResolver`\n* 📝 `DisputeTemplateRegistry`\n* <a onclick="toggleVisibility(\'deployables\', this)">[➕]</a>\n<div id="deployables" style="display:none">\n<ul>\n<li> 📝 <code>DisputeKitClassic</code></li>\n<li> 📝 <code>DisputeKitGated</code></li>\n<li> 📝 <code>DisputeKitGatedShutter</code></li>\n<li> 📝 <code>DisputeKitShutter</code></li>\n<li> 📝 <code>DisputeKitSybilResistant</code></li>\n<li> 📝 <code>EvidenceModule</code></li>\n<li> 📝 <code>RNGWithFallback</code></li>\n<li> 📝 <code>ChainlinkRNG</code></li>\n<li> 📝 <code>UUPSProxy</code></li>\n</ul>\n</div>\n            \n\n\n\n#### <span id=t-out-of-scope>Out of Scope</span>\n\n##### <span id=t-out-of-scope-excluded-source-units>Excluded Source Units</span>\n\nSource Units Excluded: **`0`**\n\n<a onclick="toggleVisibility(\'excluded-files\', this)">[➕]</a>\n<div id="excluded-files" style="display:none">\n| File   |\n| ------ |\n| None |\n\n</div>\n\n\n##### <span id=t-out-of-scope-duplicate-source-units>Duplicate Source Units</span>\n\nDuplicate Source Units Excluded: **`0`** \n\n<a onclick="toggleVisibility(\'duplicate-files\', this)">[➕]</a>\n<div id="duplicate-files" style="display:none">\n| File   |\n| ------ |\n| None |\n\n</div>\n\n##### <span id=t-out-of-scope-doppelganger-contracts>Doppelganger Contracts</span>\n\nDoppelganger Contracts: **`3`** \n\n<a onclick="toggleVisibility(\'doppelganger-contracts\', this)">[➕]</a>\n<div id="doppelganger-contracts" style="display:none">\n| File   | Contract | Doppelganger | \n| ------ | -------- | ------------ |\n| src/arbitration/dispute-kits/DisputeKitGated.sol | IBalanceHolderERC1155 | (fuzzy) [0](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [1](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [2](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [3](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [4](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [5](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [6](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [7](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [8](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-beta.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [9](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [10](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [11](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [12](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.2.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [13](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0/contracts/introspection/IERC1820Implementer.sol), [14](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.0/contracts/drafts/IERC1820Implementer.sol), [15](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.1/contracts/drafts/IERC1820Implementer.sol), [16](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.2/contracts/introspection/IERC1820Implementer.sol), [17](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.3/contracts/introspection/IERC1820Implementer.sol), [18](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0/contracts/introspection/IERC1820Implementer.sol), [19](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [20](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.1/contracts/introspection/IERC1820Implementer.sol), [21](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.2/contracts/introspection/IERC1820Implementer.sol), [22](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [23](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [24](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.1/contracts/introspection/IERC1820Implementer.sol), [25](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0/contracts/introspection/IERC1820Implementer.sol), [26](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [27](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [28](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.1/contracts/introspection/IERC1820Implementer.sol), [29](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.1/contracts/introspection/IERC1820Implementer.sol), [30](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.2/contracts/introspection/IERC1820Implementer.sol), [31](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0/contracts/introspection/IERC1820Implementer.sol), [32](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [33](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0/contracts/introspection/IERC1820Implementer.sol), [34](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [35](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.1-solc-0.7/contracts/introspection/IERC1820Implementer.sol), [36](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820Implementer.sol) |\n| src/arbitration/dispute-kits/DisputeKitGatedShutter.sol | IBalanceHolderERC1155 | (fuzzy) [0](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [1](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [2](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [3](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [4](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [5](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [6](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0-solc-0.7/contracts/introspection/IERC1820ImplementerUpgradeable.sol), [7](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [8](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-beta.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [9](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [10](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [11](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0-rc.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [12](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.2.0/contracts/utils/introspection/IERC1820ImplementerUpgradeable.sol), [13](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0/contracts/introspection/IERC1820Implementer.sol), [14](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.0/contracts/drafts/IERC1820Implementer.sol), [15](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.1/contracts/drafts/IERC1820Implementer.sol), [16](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.2/contracts/introspection/IERC1820Implementer.sol), [17](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.3/contracts/introspection/IERC1820Implementer.sol), [18](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0/contracts/introspection/IERC1820Implementer.sol), [19](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [20](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.1/contracts/introspection/IERC1820Implementer.sol), [21](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.2/contracts/introspection/IERC1820Implementer.sol), [22](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0/contracts/introspection/IERC1820Implementer.sol), [23](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [24](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.1/contracts/introspection/IERC1820Implementer.sol), [25](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0/contracts/introspection/IERC1820Implementer.sol), [26](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-beta.0/contracts/introspection/IERC1820Implementer.sol), [27](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [28](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.1/contracts/introspection/IERC1820Implementer.sol), [29](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.1/contracts/introspection/IERC1820Implementer.sol), [30](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.2/contracts/introspection/IERC1820Implementer.sol), [31](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0/contracts/introspection/IERC1820Implementer.sol), [32](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [33](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0/contracts/introspection/IERC1820Implementer.sol), [34](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0-rc.0/contracts/introspection/IERC1820Implementer.sol), [35](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.1-solc-0.7/contracts/introspection/IERC1820Implementer.sol), [36](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.2-solc-0.7/contracts/introspection/IERC1820Implementer.sol) |\n| src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | IProofOfHumanity | (fuzzy) [0](https://github.com/smartcontractkit/chainlink/blob/explorer-v0.8.5/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [1](https://github.com/smartcontractkit/chainlink/blob/upgrade/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [2](https://github.com/smartcontractkit/chainlink/blob/v.0.8.12/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [3](https://github.com/smartcontractkit/chainlink/blob/v0.8.12/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [4](https://github.com/smartcontractkit/chainlink/blob/v0.8.13/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [5](https://github.com/smartcontractkit/chainlink/blob/v0.8.14/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [6](https://github.com/smartcontractkit/chainlink/blob/v0.8.15/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [7](https://github.com/smartcontractkit/chainlink/blob/v0.8.16/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [8](https://github.com/smartcontractkit/chainlink/blob/v0.8.17/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [9](https://github.com/smartcontractkit/chainlink/blob/v0.8.18/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [10](https://github.com/smartcontractkit/chainlink/blob/v0.9.0/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [11](https://github.com/smartcontractkit/chainlink/blob/v0.9.2/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [12](https://github.com/smartcontractkit/chainlink/blob/v0.9.3/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [13](https://github.com/smartcontractkit/chainlink/blob/v0.9.4/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [14](https://github.com/smartcontractkit/chainlink/blob/v0.9.5/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [15](https://github.com/smartcontractkit/chainlink/blob/v0.9.6/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [16](https://github.com/smartcontractkit/chainlink/blob/v0.9.7/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [17](https://github.com/smartcontractkit/chainlink/blob/v0.9.8/evm-contracts/src/v0.6/interfaces/BlockHashStoreInterface.sol), [18](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.0.0/contracts/introspection/IERC165.sol), [19](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.0.1/contracts/introspection/IERC165.sol), [20](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.0.2/contracts/introspection/IERC165.sol), [21](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.1.2/contracts/introspection/IERC165.sol), [22](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.1.3/contracts/introspection/IERC165.sol), [23](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.2.1/contracts/introspection/IERC165.sol), [24](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.2.2/contracts/introspection/IERC165.sol), [25](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.2.3/contracts/introspection/IERC165.sol), [26](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v2.5.0/contracts/introspection/IERC165.sol), [27](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.0/contracts/introspection/IERC165Upgradeable.sol), [28](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.2.2-solc-0.7/contracts/introspection/IERC165Upgradeable.sol), [29](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0/contracts/introspection/IERC165Upgradeable.sol), [30](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.3.0-solc-0.7/contracts/introspection/IERC165Upgradeable.sol), [31](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0/contracts/introspection/IERC165Upgradeable.sol), [32](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v3.4.0-solc-0.7/contracts/introspection/IERC165Upgradeable.sol), [33](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0/contracts/utils/introspection/IERC165Upgradeable.sol), [34](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-beta.0/contracts/utils/introspection/IERC165Upgradeable.sol), [35](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.0.0-rc.0/contracts/utils/introspection/IERC165Upgradeable.sol), [36](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0/contracts/utils/introspection/IERC165Upgradeable.sol), [37](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.1.0-rc.0/contracts/utils/introspection/IERC165Upgradeable.sol), [38](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/v4.2.0/contracts/utils/introspection/IERC165Upgradeable.sol), [39](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0/contracts/introspection/IERC165.sol), [40](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.1/contracts/introspection/IERC165.sol), [41](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.2/contracts/introspection/IERC165.sol), [42](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.3/contracts/introspection/IERC165.sol), [43](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0-rc.4/contracts/introspection/IERC165.sol), [44](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.1/contracts/introspection/IERC165.sol), [45](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.0-rc.1/contracts/introspection/IERC165.sol), [46](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.0-rc.2/contracts/introspection/IERC165.sol), [47](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.1/contracts/introspection/IERC165.sol), [48](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.2/contracts/introspection/IERC165.sol), [49](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.1.3/contracts/introspection/IERC165.sol), [50](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.2.0/contracts/introspection/IERC165.sol), [51](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.2.0-rc.1/contracts/introspection/IERC165.sol), [52](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0/contracts/introspection/IERC165.sol), [53](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.0/contracts/introspection/IERC165.sol), [54](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.1/contracts/introspection/IERC165.sol), [55](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.2/contracts/introspection/IERC165.sol), [56](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.3.0-rc.3/contracts/introspection/IERC165.sol), [57](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0/contracts/introspection/IERC165.sol), [58](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.0/contracts/introspection/IERC165.sol), [59](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.1/contracts/introspection/IERC165.sol), [60](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.4.0-beta.2/contracts/introspection/IERC165.sol), [61](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0/contracts/introspection/IERC165.sol), [62](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.0-rc.0/contracts/introspection/IERC165.sol), [63](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.5.1/contracts/introspection/IERC165.sol), [64](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0/contracts/introspection/IERC165.sol), [65](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-beta.0/contracts/introspection/IERC165.sol), [66](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.0/contracts/introspection/IERC165.sol), [67](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.0-rc.1/contracts/introspection/IERC165.sol), [68](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.1/contracts/introspection/IERC165.sol), [69](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.0.2/contracts/introspection/IERC165.sol), [70](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0/contracts/introspection/IERC165.sol), [71](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.1.0-rc.0/contracts/introspection/IERC165.sol), [72](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0/contracts/introspection/IERC165.sol), [73](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.0-rc.0/contracts/introspection/IERC165.sol), [74](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.1-solc-0.7/contracts/introspection/IERC165.sol), [75](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v3.2.2-solc-0.7/contracts/introspection/IERC165.sol) |\n\n</div>\n\n\n## <span id=t-report>Report</span>\n\n### Overview\n\nThe analysis finished with **`0`** errors and **`0`** duplicate files.\n\n\n\n\n\n#### <span id=t-risk>Risk</span>\n\n<div class="wrapper" style="max-width: 512px; margin: auto">\n\t\t\t<canvas id="chart-risk-summary"></canvas>\n</div>\n\n#### <span id=t-source-lines>Source Lines (sloc vs. nsloc)</span>\n\n<div class="wrapper" style="max-width: 512px; margin: auto">\n    <canvas id="chart-nsloc-total"></canvas>\n</div>\n\n#### <span id=t-inline-documentation>Inline Documentation</span>\n\n- **Comment-to-Source Ratio:** On average there are`1.56` code lines per comment (lower=better).\n- **ToDo\'s:** `3` \n\n#### <span id=t-components>Components</span>\n\n| 📝Contracts   | 📚Libraries | 🔍Interfaces | 🎨Abstract |\n| ------------- | ----------- | ------------ | ---------- |\n| 14 | 2  | 13  | 3 |\n\n#### <span id=t-exposed-functions>Exposed Functions</span>\n\nThis section lists functions that are explicitly declared public or payable. Please note that getter methods for public stateVars are not included.  \n\n| 🌐Public   | 💰Payable |\n| ---------- | --------- |\n| 191 | 10  | \n\n| External   | Internal | Private | Pure | View |\n| ---------- | -------- | ------- | ---- | ---- |\n| 175 | 197  | 1 | 9 | 92 |\n\n#### <span id=t-statevariables>StateVariables</span>\n\n| Total      | 🌐Public  |\n| ---------- | --------- |\n| 88  | 82 |\n\n#### <span id=t-capabilities>Capabilities</span>\n\n| Solidity Versions observed | 🧪 Experimental Features | 💰 Can Receive Funds | 🖥 Uses Assembly | 💣 Has Destroyable Contracts | \n| -------------------------- | ------------------------ | -------------------- | ---------------- | ---------------------------- |\n| `^0.8.24`<br/>`^0.8.28`<br/>`>=0.8.0 <0.9.0` |  | `yes` | `yes` <br/>(10 asm blocks) | **** | \n\n| 📤 Transfers ETH | ⚡ Low-Level Calls | 👥 DelegateCall | 🧮 Uses Hash Functions | 🔖 ECRecover | 🌀 New/Create/Create2 |\n| ---------------- | ----------------- | --------------- | ---------------------- | ------------ | --------------------- |\n| `yes` | **** | `yes` | `yes` | **** | **** | \n\n| ♻️ TryCatch | Σ Unchecked |\n| ---------- | ----------- |\n| `yes` | **** |\n\n#### <span id=t-package-imports>Dependencies / External Imports</span>\n\n| Dependency / Import Path | Count  | \n| ------------------------ | ------ |\n| @chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol | 1 |\n| @openzeppelin/contracts/token/ERC20/IERC20.sol | 3 |\n| @openzeppelin/contracts/token/ERC721/IERC721.sol | 1 |\n\n#### <span id=t-totals>Totals</span>\n\n##### Summary\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar"></canvas>\n</div>\n\n##### AST Node Statistics\n\n###### Function Calls\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar-ast-funccalls"></canvas>\n</div>\n\n###### Assembly Calls\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar-ast-asmcalls"></canvas>\n</div>\n\n###### AST Total\n\n<div class="wrapper" style="max-width: 90%; margin: auto">\n    <canvas id="chart-num-bar-ast"></canvas>\n</div>\n\n##### Inheritance Graph\n\n<a onclick="toggleVisibility(\'surya-inherit\', this)">[➕]</a>\n<div id="surya-inherit" style="display:none">\n<div class="wrapper" style="max-width: 512px; margin: auto">\n    <div id="surya-inheritance" style="text-align: center;"></div> \n</div>\n</div>\n\n##### CallGraph\n\n<a onclick="toggleVisibility(\'surya-call\', this)">[➕]</a>\n<div id="surya-call" style="display:none">\n<div class="wrapper" style="max-width: 512px; margin: auto">\n    <div id="surya-callgraph" style="text-align: center;"></div>\n</div>\n</div>\n\n###### Contract Summary\n\n<a onclick="toggleVisibility(\'surya-mdreport\', this)">[➕]</a>\n<div id="surya-mdreport" style="display:none">\n \n\n Files Description Table\n\n\n|  File Name  |  SHA-1 Hash  |\n|-------------|--------------|\n| src/arbitration/KlerosCore.sol | 383e209070883ddd480ef42f775d9c46dd3a9312 |\n| src/arbitration/PolicyRegistry.sol | 513ee51fc5262e41bf1ee58c19011b2166bb8281 |\n| src/arbitration/SortitionModule.sol | 455986084175670bcd15911f4f04cbf64203da41 |\n| src/arbitration/arbitrables/DisputeResolver.sol | 985b9082c8187d8c4d35e1c88c54f954532cd94f |\n| src/arbitration/DisputeTemplateRegistry.sol | 3cc2892233d940bf4523414680e361869f6df054 |\n| src/arbitration/dispute-kits/DisputeKitClassic.sol | b7a6a3c1e021f11c8f6f8ae7c184e947a7cd45d9 |\n| src/arbitration/dispute-kits/DisputeKitClassicBase.sol | c0d30028020e75203758df5241cdaf1138464b75 |\n| src/arbitration/dispute-kits/DisputeKitGated.sol | c98ed7a48f251debdd88a325245dcb8e04926311 |\n| src/arbitration/dispute-kits/DisputeKitGatedShutter.sol | bfe8f9e2598454027643644e246140623d5c73a8 |\n| src/arbitration/dispute-kits/DisputeKitShutter.sol | b77e1e9ddfcf19c31570f0bfbf01c18086c99f56 |\n| src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 8bba9bb201d66fc07abc436b7830701a92e0ffb6 |\n| src/arbitration/evidence/EvidenceModule.sol | 0098cc5e9939d1193f152890dfc94729a0d8bbd4 |\n| src/arbitration/interfaces/IArbitrableV2.sol | ce54b7140a6109b2d919cea38ff94ac2ad775398 |\n| src/arbitration/interfaces/IArbitratorV2.sol | 4e0baa0ff6155737540105f9fdb5b54ba2905d2c |\n| src/arbitration/interfaces/IDisputeKit.sol | 06e3c893fca325de50367a1a862036771295885b |\n| src/arbitration/interfaces/IDisputeTemplateRegistry.sol | 8d0351ebeee1ebd8603af9cf50c2ab62f6e8fecb |\n| src/arbitration/interfaces/IEvidence.sol | 12ee130f67f5d38afbcc810129b030cf7f58f058 |\n| src/arbitration/interfaces/ISortitionModule.sol | ea2526039c8675ddbc387198b29600a49c3584c1 |\n| src/libraries/Constants.sol | 6ce9e86c301042de2d32f9a3a5cfc2d65c34fa47 |\n| src/libraries/SafeERC20.sol | 68e49603280eab2b68eabc554dc310ff3313a64c |\n| src/libraries/SafeSend.sol | 9d282cf6456950471debec28103fcb99638fa83d |\n| src/rng/RNGWithFallback.sol | 0d90b33bb4fdeb9492d5b2474135790cd0c986e5 |\n| src/rng/ChainlinkRNG.sol | 54f081a26e78c5aa0d58207372944a603eae5cf7 |\n| src/rng/IRNG.sol | 25eee63b46a76183c24b39d81ae85044474a6a02 |\n| src/proxy/UUPSProxiable.sol | 80d46ace20ea4c9c6a0cbc1093d6e88eb19aeb12 |\n| src/proxy/UUPSProxy.sol | 18a2a570a8ef2ec5f02d59bd1c03a176203e8ccf |\n| src/proxy/Initializable.sol | bf3ba9453bab903eda4247e90e39376e20744353 |\n\n\n Contracts Description Table\n\n\n|  Contract  |         Type        |       Bases      |                  |                 |\n|:----------:|:-------------------:|:----------------:|:----------------:|:---------------:|\n|     └      |  **Function Name**  |  **Visibility**  |  **Mutability**  |  **Modifiers**  |\n||||||\n| **KlerosCore** | Implementation | IArbitratorV2, Initializable, UUPSProxiable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | pause | External ❗️ | 🛑  | onlyByGuardianOrOwner whenNotPaused |\n| └ | unpause | External ❗️ | 🛑  | onlyByOwner whenPaused |\n| └ | executeOwnerProposal | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeGuardian | External ❗️ | 🛑  | onlyByOwner |\n| └ | changePinakion | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeJurorProsecutionModule | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeSortitionModule | External ❗️ | 🛑  | onlyByOwner |\n| └ | addNewDisputeKit | External ❗️ | 🛑  | onlyByOwner |\n| └ | createCourt | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeCourtParameters | External ❗️ | 🛑  | onlyByOwner |\n| └ | enableDisputeKits | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeAcceptedFeeTokens | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeCurrencyRates | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeJurorNft | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeArbitrableWhitelist | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeArbitrableWhitelistEnabled | External ❗️ | 🛑  | onlyByOwner |\n| └ | setStake | External ❗️ | 🛑  | whenNotPaused |\n| └ | setStakeBySortitionModule | External ❗️ | 🛑  |NO❗️ |\n| └ | transferBySortitionModule | External ❗️ | 🛑  |NO❗️ |\n| └ | createDispute | External ❗️ |  💵 |NO❗️ |\n| └ | createDispute | External ❗️ | 🛑  |NO❗️ |\n| └ | _createDispute | Internal 🔒 | 🛑  | |\n| └ | passPeriod | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | External ❗️ | 🛑  |NO❗️ |\n| └ | appeal | External ❗️ |  💵 |NO❗️ |\n| └ | execute | External ❗️ | 🛑  | whenNotPaused |\n| └ | _executePenalties | Internal 🔒 | 🛑  | |\n| └ | _executeRewards | Internal 🔒 | 🛑  | |\n| └ | executeRuling | External ❗️ | 🛑  |NO❗️ |\n| └ | arbitrationCost | Public ❗️ |   |NO❗️ |\n| └ | arbitrationCost | Public ❗️ |   |NO❗️ |\n| └ | appealCost | Public ❗️ |   |NO❗️ |\n| └ | appealPeriod | External ❗️ |   |NO❗️ |\n| └ | currentRuling | Public ❗️ |   |NO❗️ |\n| └ | getRoundInfo | External ❗️ |   |NO❗️ |\n| └ | getPnkAtStakePerJuror | External ❗️ |   |NO❗️ |\n| └ | getNumberOfRounds | External ❗️ |   |NO❗️ |\n| └ | isSupported | External ❗️ |   |NO❗️ |\n| └ | getTimesPerPeriod | External ❗️ |   |NO❗️ |\n| └ | getNumberOfVotes | External ❗️ |   |NO❗️ |\n| └ | isDisputeKitJumping | External ❗️ |   |NO❗️ |\n| └ | getDisputeKitsLength | External ❗️ |   |NO❗️ |\n| └ | convertEthToTokenAmount | Public ❗️ |   |NO❗️ |\n| └ | _isCourtJumping | Internal 🔒 |   | |\n| └ | _getCourtAndDisputeKitJumps | Internal 🔒 |   | |\n| └ | _transferFeeToken | Internal 🔒 | 🛑  | |\n| └ | _applyCoherence | Internal 🔒 |   | |\n| └ | _calculatePnkAtStake | Internal 🔒 |   | |\n| └ | _enableDisputeKit | Internal 🔒 | 🛑  | |\n| └ | _setStake | Internal 🔒 | 🛑  | |\n| └ | _stakingFailed | Internal 🔒 |   | |\n| └ | _extraDataToCourtIDMinJurorsDisputeKit | Internal 🔒 |   | |\n||||||\n| **PolicyRegistry** | Implementation | UUPSProxiable, Initializable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | setPolicy | External ❗️ | 🛑  | onlyByOwner |\n||||||\n| **SortitionModule** | Implementation | ISortitionModule, Initializable, UUPSProxiable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeMinStakingTime | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeMaxDrawingTime | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeRandomNumberGenerator | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeMaxStakePerJuror | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeMaxTotalStaked | External ❗️ | 🛑  | onlyByOwner |\n| └ | passPhase | External ❗️ | 🛑  |NO❗️ |\n| └ | createTree | External ❗️ | 🛑  | onlyByCore |\n| └ | executeDelayedStakes | External ❗️ | 🛑  |NO❗️ |\n| └ | createDisputeHook | External ❗️ | 🛑  | onlyByCore |\n| └ | postDrawHook | External ❗️ | 🛑  | onlyByCore |\n| └ | notifyRandomNumber | Public ❗️ | 🛑  |NO❗️ |\n| └ | validateStake | External ❗️ | 🛑  | onlyByCore |\n| └ | _validateStake | Internal 🔒 | 🛑  | |\n| └ | setStake | External ❗️ | 🛑  | onlyByCore |\n| └ | setStakePenalty | External ❗️ | 🛑  | onlyByCore |\n| └ | setStakeReward | External ❗️ | 🛑  | onlyByCore |\n| └ | _setStake | Internal 🔒 | 🛑  | |\n| └ | lockStake | External ❗️ | 🛑  | onlyByCore |\n| └ | unlockStake | External ❗️ | 🛑  | onlyByCore |\n| └ | forcedUnstakeAllCourts | External ❗️ | 🛑  | onlyByCore |\n| └ | forcedUnstake | External ❗️ | 🛑  | onlyByCore |\n| └ | withdrawLeftoverPNK | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | Public ❗️ |   |NO❗️ |\n| └ | stakeOf | Public ❗️ |   |NO❗️ |\n| └ | getJurorBalance | External ❗️ |   |NO❗️ |\n| └ | getJurorCourtIDs | Public ❗️ |   |NO❗️ |\n| └ | isJurorStaked | External ❗️ |   |NO❗️ |\n| └ | getJurorLeftoverPNK | Public ❗️ |   |NO❗️ |\n| └ | _extraDataToTreeK | Internal 🔒 |   | |\n||||||\n| **DisputeResolver** | Implementation | IArbitrableV2 |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | changeOwner | External ❗️ | 🛑  |NO❗️ |\n| └ | changeArbitrator | External ❗️ | 🛑  |NO❗️ |\n| └ | changeTemplateRegistry | External ❗️ | 🛑  |NO❗️ |\n| └ | createDisputeForTemplate | External ❗️ |  💵 |NO❗️ |\n| └ | createDisputeForTemplateUri | External ❗️ |  💵 |NO❗️ |\n| └ | rule | External ❗️ | 🛑  |NO❗️ |\n| └ | _createDispute | Internal 🔒 | 🛑  | |\n||||||\n| **DisputeTemplateRegistry** | Implementation | IDisputeTemplateRegistry, UUPSProxiable, Initializable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | setDisputeTemplate | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **DisputeKitClassic** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n||||||\n| **DisputeKitClassicBase** | Implementation | IDisputeKit, Initializable, UUPSProxiable |||\n| └ | __DisputeKitClassicBase_initialize | Internal 🔒 | 🛑  | onlyInitializing |\n| └ | executeOwnerProposal | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeCore | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeJumpDisputeKitID | External ❗️ | 🛑  | onlyByOwner |\n| └ | createDispute | External ❗️ | 🛑  | onlyByCore |\n| └ | draw | External ❗️ | 🛑  | onlyByCore notJumped |\n| └ | castCommit | External ❗️ | 🛑  |NO❗️ |\n| └ | _castCommit | Internal 🔒 | 🛑  | notJumped |\n| └ | castVote | External ❗️ | 🛑  |NO❗️ |\n| └ | _castVote | Internal 🔒 | 🛑  | notJumped |\n| └ | fundAppeal | External ❗️ |  💵 | notJumped |\n| └ | withdrawFeesAndRewards | External ❗️ | 🛑  |NO❗️ |\n| └ | hashVote | Public ❗️ |   |NO❗️ |\n| └ | getFundedChoices | Public ❗️ |   |NO❗️ |\n| └ | currentRuling | External ❗️ |   |NO❗️ |\n| └ | getDegreeOfCoherenceReward | External ❗️ |   |NO❗️ |\n| └ | getDegreeOfCoherencePenalty | External ❗️ |   |NO❗️ |\n| └ | _getDegreeOfCoherence | Internal 🔒 |   | |\n| └ | getCoherentCount | External ❗️ |   |NO❗️ |\n| └ | areCommitsAllCast | External ❗️ |   |NO❗️ |\n| └ | areVotesAllCast | External ❗️ |   |NO❗️ |\n| └ | isAppealFunded | External ❗️ |   |NO❗️ |\n| └ | earlyCourtJump | External ❗️ |   |NO❗️ |\n| └ | getNbVotesAfterAppeal | External ❗️ |   |NO❗️ |\n| └ | getJumpDisputeKitID | External ❗️ |   |NO❗️ |\n| └ | isVoteActive | External ❗️ |   |NO❗️ |\n| └ | getRoundInfo | External ❗️ |   |NO❗️ |\n| └ | getNumberOfRounds | External ❗️ |   |NO❗️ |\n| └ | getLocalDisputeRoundID | External ❗️ |   |NO❗️ |\n| └ | getVoteInfo | External ❗️ |   |NO❗️ |\n| └ | _getExpectedVoteHash | Internal 🔒 |   | |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **IBalanceHolder** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **IBalanceHolderERC1155** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **DisputeKitGated** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | extraDataToTokenInfo | Public ❗️ |   |NO❗️ |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **IBalanceHolder** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **IBalanceHolderERC1155** | Interface |  |||\n| └ | balanceOf | External ❗️ |   |NO❗️ |\n||||||\n| **DisputeKitGatedShutter** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | castCommitShutter | External ❗️ | 🛑  | notJumped |\n| └ | castVoteShutter | External ❗️ | 🛑  |NO❗️ |\n| └ | hashVote | Public ❗️ |   |NO❗️ |\n| └ | _getExpectedVoteHash | Internal 🔒 |   | |\n| └ | _extraDataToTokenInfo | Internal 🔒 |   | |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **DisputeKitShutter** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | castCommitShutter | External ❗️ | 🛑  | notJumped |\n| └ | castVoteShutter | External ❗️ | 🛑  |NO❗️ |\n| └ | hashVote | Public ❗️ |   |NO❗️ |\n| └ | _getExpectedVoteHash | Internal 🔒 |   | |\n||||||\n| **IProofOfHumanity** | Interface |  |||\n| └ | isRegistered | External ❗️ |   |NO❗️ |\n||||||\n| **DisputeKitSybilResistant** | Implementation | DisputeKitClassicBase |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | _postDrawCheck | Internal 🔒 |   | |\n||||||\n| **EvidenceModule** | Implementation | IEvidence, Initializable, UUPSProxiable |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | initialize | External ❗️ | 🛑  | initializer |\n| └ | _authorizeUpgrade | Internal 🔒 |   | onlyByOwner |\n| └ | submitEvidence | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **IArbitrableV2** | Interface |  |||\n| └ | rule | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **IArbitratorV2** | Interface |  |||\n| └ | createDispute | External ❗️ |  💵 |NO❗️ |\n| └ | createDispute | External ❗️ | 🛑  |NO❗️ |\n| └ | arbitrationCost | External ❗️ |   |NO❗️ |\n| └ | arbitrationCost | External ❗️ |   |NO❗️ |\n| └ | currentRuling | External ❗️ |   |NO❗️ |\n||||||\n| **IDisputeKit** | Interface |  |||\n| └ | createDispute | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | External ❗️ | 🛑  |NO❗️ |\n| └ | currentRuling | External ❗️ |   |NO❗️ |\n| └ | getDegreeOfCoherenceReward | External ❗️ |   |NO❗️ |\n| └ | getDegreeOfCoherencePenalty | External ❗️ |   |NO❗️ |\n| └ | getCoherentCount | External ❗️ |   |NO❗️ |\n| └ | areCommitsAllCast | External ❗️ |   |NO❗️ |\n| └ | areVotesAllCast | External ❗️ |   |NO❗️ |\n| └ | isAppealFunded | External ❗️ |   |NO❗️ |\n| └ | earlyCourtJump | External ❗️ |   |NO❗️ |\n| └ | getNbVotesAfterAppeal | External ❗️ |   |NO❗️ |\n| └ | getJumpDisputeKitID | External ❗️ |   |NO❗️ |\n| └ | isVoteActive | External ❗️ |   |NO❗️ |\n| └ | getRoundInfo | External ❗️ |   |NO❗️ |\n| └ | getVoteInfo | External ❗️ |   |NO❗️ |\n||||||\n| **IDisputeTemplateRegistry** | Interface |  |||\n| └ | setDisputeTemplate | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **IEvidence** | Interface |  |||\n||||||\n| **ISortitionModule** | Interface |  |||\n| └ | createTree | External ❗️ | 🛑  |NO❗️ |\n| └ | validateStake | External ❗️ | 🛑  |NO❗️ |\n| └ | setStake | External ❗️ | 🛑  |NO❗️ |\n| └ | setStakePenalty | External ❗️ | 🛑  |NO❗️ |\n| └ | setStakeReward | External ❗️ | 🛑  |NO❗️ |\n| └ | forcedUnstakeAllCourts | External ❗️ | 🛑  |NO❗️ |\n| └ | forcedUnstake | External ❗️ | 🛑  |NO❗️ |\n| └ | lockStake | External ❗️ | 🛑  |NO❗️ |\n| └ | unlockStake | External ❗️ | 🛑  |NO❗️ |\n| └ | notifyRandomNumber | External ❗️ | 🛑  |NO❗️ |\n| └ | draw | External ❗️ |   |NO❗️ |\n| └ | getJurorBalance | External ❗️ |   |NO❗️ |\n| └ | getJurorCourtIDs | External ❗️ |   |NO❗️ |\n| └ | isJurorStaked | External ❗️ |   |NO❗️ |\n| └ | getJurorLeftoverPNK | External ❗️ |   |NO❗️ |\n| └ | createDisputeHook | External ❗️ | 🛑  |NO❗️ |\n| └ | postDrawHook | External ❗️ | 🛑  |NO❗️ |\n| └ | withdrawLeftoverPNK | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **SafeERC20** | Library |  |||\n| └ | increaseAllowance | Internal 🔒 | 🛑  | |\n| └ | safeTransfer | Internal 🔒 | 🛑  | |\n| └ | safeTransferFrom | Internal 🔒 | 🛑  | |\n||||||\n| **WethLike** | Interface |  |||\n| └ | deposit | External ❗️ |  💵 |NO❗️ |\n| └ | transfer | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **SafeSend** | Library |  |||\n| └ | safeSend | Internal 🔒 | 🛑  | |\n||||||\n| **RNGWithFallback** | Implementation | IRNG |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeConsumer | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeFallbackTimeout | External ❗️ | 🛑  | onlyByOwner |\n| └ | requestRandomness | External ❗️ | 🛑  | onlyByConsumer |\n| └ | receiveRandomness | External ❗️ | 🛑  | onlyByConsumer |\n||||||\n| **ChainlinkRNG** | Implementation | IRNG, VRFConsumerBaseV2Plus |||\n| └ | <Constructor> | Public ❗️ | 🛑  | VRFConsumerBaseV2Plus |\n| └ | changeOwner | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeConsumer | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeVrfCoordinator | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeKeyHash | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeSubscriptionId | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeRequestConfirmations | External ❗️ | 🛑  | onlyByOwner |\n| └ | changeCallbackGasLimit | External ❗️ | 🛑  | onlyByOwner |\n| └ | requestRandomness | External ❗️ | 🛑  | onlyByConsumer |\n| └ | fulfillRandomWords | Internal 🔒 | 🛑  | |\n| └ | receiveRandomness | External ❗️ |   |NO❗️ |\n||||||\n| **IRNG** | Interface |  |||\n| └ | requestRandomness | External ❗️ | 🛑  |NO❗️ |\n| └ | receiveRandomness | External ❗️ | 🛑  |NO❗️ |\n||||||\n| **UUPSProxiable** | Implementation |  |||\n| └ | _authorizeUpgrade | Internal 🔒 | 🛑  | |\n| └ | upgradeToAndCall | Public ❗️ |  💵 |NO❗️ |\n| └ | proxiableUUID | External ❗️ |   |NO❗️ |\n| └ | version | External ❗️ |   |NO❗️ |\n| └ | _getImplementation | Internal 🔒 |   | |\n||||||\n| **UUPSProxy** | Implementation |  |||\n| └ | <Constructor> | Public ❗️ | 🛑  |NO❗️ |\n| └ | _delegate | Internal 🔒 | 🛑  | |\n| └ | _getImplementation | Internal 🔒 |   | |\n| └ | <Fallback> | External ❗️ |  💵 |NO❗️ |\n| └ | <Receive Ether> | External ❗️ |  💵 |NO❗️ |\n||||||\n| **Initializable** | Implementation |  |||\n| └ | _checkInitializing | Internal 🔒 |   | |\n| └ | _disableInitializers | Internal 🔒 | 🛑  | |\n| └ | _getInitializedVersion | Internal 🔒 |   | |\n| └ | _isInitializing | Internal 🔒 |   | |\n| └ | _getInitializableStorage | Private 🔐 |   | |\n\n\n Legend\n\n|  Symbol  |  Meaning  |\n|:--------:|-----------|\n|    🛑    | Function can modify state |\n|    💵    | Function is payable |\n \n\n</div>\n____\n<sub>\nThinking about smart contract security? We can provide training, ongoing advice, and smart contract auditing. [Contact us](https://consensys.io/diligence/contact/).\n</sub>\n\n',
         jsonData: {
           totals: {
             ast: {
-              SourceUnit: 31,
-              PragmaDirective: 31,
-              "Pragma:solidity:^0.8.24": 24,
-              ImportDirective: 51,
-              StringLiteral: 130,
-              Identifier: 3787,
-              ContractDefinition: 36,
-              "ContractDefinition:Contract": 16,
-              "ContractDefinition:BaseContracts": 30,
+              SourceUnit: 27,
+              PragmaDirective: 27,
+              "Pragma:solidity:^0.8.24": 19,
+              ImportDirective: 49,
+              StringLiteral: 74,
+              Identifier: 3775,
+              "ImportDirective:Path:@openzeppelin/contracts/token/ERC721/IERC721.sol": 1,
+              ContractDefinition: 32,
+              "ContractDefinition:Contract": 14,
+              "ContractDefinition:BaseContracts": 26,
               "ContractDefinition:LogicContractNames": [
                 "KlerosCore",
-                "KlerosCoreNeo",
                 "PolicyRegistry",
                 "SortitionModule",
-                "SortitionModuleNeo",
                 "DisputeResolver",
                 "DisputeTemplateRegistry",
                 "DisputeKitClassic",
@@ -208825,11 +208824,9 @@
                 "UUPSProxy",
               ],
               "ContractDefinition:BaseContractNames": [
-                "KlerosCoreBase",
                 "IArbitratorV2",
                 "Initializable",
                 "UUPSProxiable",
-                "SortitionModuleBase",
                 "ISortitionModule",
                 "IArbitrableV2",
                 "IDisputeTemplateRegistry",
@@ -208839,76 +208836,75 @@
                 "IRNG",
                 "VRFConsumerBaseV2Plus",
               ],
-              InheritanceSpecifier: 30,
-              UserDefinedTypeName: 232,
-              "UserDefinedTypeName:KlerosCoreBase": 2,
-              StateVariableDeclaration: 87,
-              VariableDeclaration: 1206,
-              "StateVariableDeclaration:Public": 80,
-              "StateVariableDeclaration:Const": 21,
-              ElementaryTypeName: 1074,
-              FunctionDefinition: 265,
-              "FunctionDefinition:Internal": 217,
-              "FunctionDefinition:Default": 16,
-              Block: 403,
-              ExpressionStatement: 457,
-              FunctionCall: 476,
-              "FunctionCall:Type:Regular": 134,
-              "FunctionCall:Name:_disableInitializers": 12,
-              "FunctionDefinition:External": 175,
-              "UserDefinedTypeName:IERC20": 26,
-              "UserDefinedTypeName:IDisputeKit": 13,
-              "VariableDeclaration:Memory": 60,
-              ArrayTypeName: 50,
-              NumberLiteral: 253,
-              "UserDefinedTypeName:ISortitionModule": 7,
-              "FunctionCall:Name:__KlerosCoreBase_initialize": 2,
-              ModifierInvocation: 103,
-              BinaryOperation: 660,
-              "FunctionDefinition:View": 80,
-              "ContractDefinition:Abstract": 5,
+              InheritanceSpecifier: 26,
+              UserDefinedTypeName: 225,
               "UserDefinedTypeName:IArbitratorV2": 6,
               "UserDefinedTypeName:Initializable": 6,
               "UserDefinedTypeName:UUPSProxiable": 6,
-              UsingForDeclaration: 3,
+              UsingForDeclaration: 5,
+              "UserDefinedTypeName:IERC20": 23,
+              ElementaryTypeName: 1097,
+              StateVariableDeclaration: 88,
+              VariableDeclaration: 1227,
+              "StateVariableDeclaration:Public": 82,
+              "StateVariableDeclaration:Const": 17,
               EnumDefinition: 4,
               EnumValue: 20,
-              StructDefinition: 13,
-              Mapping: 24,
+              StructDefinition: 12,
+              ArrayTypeName: 45,
+              NumberLiteral: 213,
+              Mapping: 29,
               "UserDefinedTypeName:IArbitrableV2": 6,
               "UserDefinedTypeName:Period": 2,
-              "UserDefinedTypeName:Round": 31,
-              "StateVariableDeclaration:Private": 6,
-              TupleExpression: 54,
-              "UserDefinedTypeName:Court": 9,
-              "UserDefinedTypeName:Dispute": 35,
+              "UserDefinedTypeName:Round": 33,
+              "StateVariableDeclaration:Private": 5,
+              BinaryOperation: 639,
+              TupleExpression: 51,
+              "UserDefinedTypeName:ISortitionModule": 5,
+              "UserDefinedTypeName:Court": 11,
+              "UserDefinedTypeName:IDisputeKit": 13,
+              "UserDefinedTypeName:Dispute": 38,
               "UserDefinedTypeName:CurrencyRate": 1,
+              "UserDefinedTypeName:IERC721": 3,
               EventDefinition: 43,
               "VariableDeclaration:Indexed": 72,
               ModifierDefinition: 19,
-              IfStatement: 164,
-              MemberAccess: 844,
-              RevertStatement: 53,
-              UnaryOperation: 54,
+              Block: 386,
+              IfStatement: 215,
+              MemberAccess: 823,
+              RevertStatement: 103,
+              FunctionCall: 478,
+              ExpressionStatement: 389,
+              UnaryOperation: 56,
+              FunctionDefinition: 257,
+              "FunctionDefinition:Internal": 197,
+              "FunctionDefinition:Default": 14,
+              "FunctionCall:Type:Regular": 132,
+              "FunctionCall:Name:_disableInitializers": 10,
+              "FunctionDefinition:External": 175,
+              "VariableDeclaration:Memory": 53,
               EmitStatement: 52,
-              "FunctionCall:Type:MemberAccess": 97,
-              "FunctionCall:Name:createTree": 3,
-              VariableDeclarationStatement: 217,
-              "VariableDeclaration:Storage": 91,
+              "FunctionCall:Type:MemberAccess": 113,
+              "FunctionCall:Name:createTree": 4,
+              VariableDeclarationStatement: 215,
+              "VariableDeclaration:Storage": 92,
               NewExpression: 3,
-              IndexAccess: 295,
+              IndexAccess: 297,
               "FunctionCall:Name:_enableDisputeKit": 4,
-              BooleanLiteral: 51,
+              BooleanLiteral: 61,
+              ModifierInvocation: 88,
+              "FunctionDefinition:View": 92,
               NameValueExpression: 5,
               NameValueList: 5,
-              ForStatement: 10,
-              "FunctionCall:Name:_setStake": 4,
+              ForStatement: 11,
               "FunctionCall:Name:address": 28,
+              "FunctionCall:Name:balanceOf": 5,
+              "FunctionCall:Name:_setStake": 5,
               "FunctionCall:Name:safeTransfer": 6,
               "FunctionDefinition:Payable": 10,
               "FunctionCall:Name:arbitrationCost": 3,
-              ReturnStatement: 77,
-              "FunctionCall:Name:_createDispute": 5,
+              ReturnStatement: 90,
+              "FunctionCall:Name:_createDispute": 4,
               "VariableDeclaration:Calldata": 27,
               "FunctionCall:Name:safeTransferFrom": 2,
               "FunctionCall:Name:_extraDataToCourtIDMinJurorsDisputeKit": 2,
@@ -208917,87 +208913,81 @@
               "FunctionCall:Name:_calculatePnkAtStake": 2,
               "FunctionCall:Name:createDisputeHook": 2,
               "FunctionCall:Name:createDispute": 2,
-              "FunctionCall:Name:areCommitsAllCast": 1,
               "FunctionCall:Name:areVotesAllCast": 1,
               "FunctionCall:Name:isAppealFunded": 1,
-              WhileStatement: 4,
-              "FunctionCall:Name:draw": 2,
+              WhileStatement: 2,
+              "FunctionCall:Name:draw": 3,
               ContinueStatement: 1,
               "FunctionCall:Name:lockStake": 1,
               "FunctionCall:Name:postDrawHook": 1,
               "FunctionCall:Name:appealCost": 2,
+              "FunctionCall:Name:_getCourtAndDisputeKitJumps": 2,
               "FunctionCall:Name:getCoherentCount": 1,
               "FunctionCall:Name:_executePenalties": 1,
               "FunctionCall:Name:_executeRewards": 1,
               "UserDefinedTypeName:ExecuteParams": 2,
-              "FunctionCall:Name:getDegreeOfCoherence": 2,
+              "FunctionCall:Name:getDegreeOfCoherencePenalty": 1,
               "FunctionCall:Name:unlockStake": 2,
-              "FunctionCall:Name:penalizeStake": 1,
+              "FunctionCall:Name:setStakePenalty": 1,
               "FunctionCall:Name:isVoteActive": 1,
-              "FunctionCall:Name:setJurorInactive": 1,
+              "FunctionCall:Name:forcedUnstakeAllCourts": 1,
+              "FunctionCall:Name:forcedUnstake": 1,
               "FunctionCall:Name:_transferFeeToken": 3,
               "FunctionCall:Name:payable": 4,
+              "FunctionCall:Name:getDegreeOfCoherenceReward": 1,
               "FunctionCall:Name:_applyCoherence": 3,
+              "FunctionCall:Name:setStakeReward": 1,
               "FunctionCall:Name:currentRuling": 6,
               "FunctionCall:Name:rule": 1,
-              "FunctionDefinition:Public": 17,
+              "FunctionDefinition:Public": 16,
+              "FunctionCall:Name:getNbVotesAfterAppeal": 1,
+              "FunctionCall:Name:_isCourtJumping": 2,
+              "FunctionCall:Name:earlyCourtJump": 1,
+              "FunctionCall:Name:getJumpDisputeKitID": 1,
               "FunctionCall:Name:safeSend": 3,
-              "FunctionDefinition:Pure": 13,
-              "UserDefinedTypeName:OnError": 3,
-              "FunctionCall:Name:_stakingFailed": 6,
-              "UserDefinedTypeName:StakingResult": 7,
+              "FunctionDefinition:Pure": 9,
+              "UserDefinedTypeName:OnError": 2,
+              "FunctionCall:Name:_stakingFailed": 5,
+              "UserDefinedTypeName:StakingResult": 5,
               "FunctionCall:Name:validateStake": 1,
               "FunctionCall:Name:setStake": 1,
-              InlineAssemblyStatement: 12,
-              AssemblyBlock: 23,
-              AssemblyAssignment: 18,
-              AssemblyCall: 99,
-              "AssemblyCall:Name:mload": 12,
-              "AssemblyCall:Name:add": 16,
-              HexNumber: 23,
-              CustomErrorDefinition: 45,
-              "ImportDirective:Path:@openzeppelin/contracts/token/ERC721/IERC721.sol": 1,
-              "UserDefinedTypeName:IERC721": 3,
-              "FunctionCall:Name:balanceOf": 5,
-              "FunctionCall:Type:BuiltIn": 57,
-              "FunctionCall:Name:require": 51,
-              "UserDefinedTypeName:SortitionModuleBase": 2,
-              "UserDefinedTypeName:KlerosCore": 11,
-              "UserDefinedTypeName:IRNG": 9,
-              "FunctionCall:Name:__SortitionModuleBase_initialize": 2,
+              InlineAssemblyStatement: 10,
+              AssemblyBlock: 12,
+              AssemblyAssignment: 13,
+              AssemblyCall: 58,
+              "AssemblyCall:Name:mload": 8,
+              "AssemblyCall:Name:add": 8,
+              HexNumber: 10,
+              CustomErrorDefinition: 86,
+              "UserDefinedTypeName:SortitionTrees.Tree": 3,
+              "UserDefinedTypeName:TreeKey": 6,
+              "UserDefinedTypeName:KlerosCore": 9,
               "UserDefinedTypeName:Phase": 2,
+              "UserDefinedTypeName:IRNG": 7,
               "StateVariableDeclaration:Default": 1,
-              "UserDefinedTypeName:SortitionSumTree": 6,
-              "UserDefinedTypeName:Juror": 8,
+              "UserDefinedTypeName:Juror": 7,
               "UserDefinedTypeName:DelayedStake": 3,
               "FunctionCall:Name:requestRandomness": 3,
               "FunctionCall:Name:receiveRandomness": 2,
+              "FunctionCall:Name:toTreeKey": 4,
+              "FunctionCall:Name:wrap": 4,
               "FunctionCall:Name:_extraDataToTreeK": 1,
-              "FunctionCall:Name:setStakeBySortitionModule": 2,
-              "FunctionCall:Name:_validateStake": 2,
-              "FunctionCall:Name:stakeOf": 5,
-              BreakStatement: 2,
-              "FunctionCall:Name:_accountAndCourtIDToStakePathID": 2,
-              "FunctionCall:Name:_set": 1,
+              "FunctionCall:Name:setStakeBySortitionModule": 3,
+              "FunctionCall:Name:_validateStake": 1,
+              "FunctionCall:Name:stakeOf": 8,
+              BreakStatement: 1,
+              "FunctionCall:Name:toStakePathID": 2,
+              "FunctionCall:Name:set": 1,
               "FunctionCall:Name:courts": 3,
               "FunctionCall:Name:getJurorLeftoverPNK": 2,
               "FunctionCall:Name:getJurorCourtIDs": 1,
               "FunctionCall:Name:transferBySortitionModule": 1,
-              "FunctionCall:Name:keccak256": 6,
-              "FunctionCall:Name:encodePacked": 2,
-              "FunctionCall:Name:_stakePathIDToAccount": 1,
-              "FunctionDefinition:Private": 2,
-              AssemblyLocalDefinition: 8,
-              AssemblyFor: 3,
-              "AssemblyCall:Name:lt": 3,
-              "AssemblyCall:Name:mstore8": 3,
-              "AssemblyCall:Name:byte": 3,
-              "FunctionCall:Name:_updateParents": 3,
               "UserDefinedTypeName:IDisputeTemplateRegistry": 4,
               "UserDefinedTypeName:DisputeStruct": 2,
               "FunctionCall:Name:setDisputeTemplate": 1,
               "UserDefinedTypeName:DisputeKitClassicBase": 5,
               "FunctionCall:Name:__DisputeKitClassicBase_initialize": 5,
+              "ContractDefinition:Abstract": 3,
               "UserDefinedTypeName:Vote": 4,
               "FunctionCall:Name:getNumberOfRounds": 2,
               "FunctionCall:Name:sortitionModule": 1,
@@ -209007,12 +208997,18 @@
               "UserDefinedTypeName:KlerosCore.Period": 3,
               "FunctionCall:Name:_castVote": 3,
               "FunctionCall:Name:hashVote": 1,
+              "FunctionCall:Name:_getExpectedVoteHash": 1,
               "FunctionCall:Name:appealPeriod": 2,
               "FunctionCall:Name:isDisputeKitJumping": 1,
               "FunctionCall:Name:getNumberOfVotes": 1,
               "FunctionCall:Name:paused": 1,
+              "FunctionCall:Type:BuiltIn": 8,
+              "FunctionCall:Name:keccak256": 7,
+              "FunctionCall:Name:encodePacked": 3,
               "FunctionCall:Name:getFundedChoices": 2,
+              "FunctionCall:Name:_getDegreeOfCoherence": 2,
               "ContractDefinition:Interface": 13,
+              AssemblyLocalDefinition: 3,
               "AssemblyCall:Name:and": 4,
               "AssemblyCall:Name:shr": 2,
               DecimalNumber: 14,
@@ -209020,12 +209016,13 @@
               "FunctionCall:Type:ContractTypecast": 6,
               "FunctionCall:Name:encode": 2,
               "FunctionCall:Name:_extraDataToTokenInfo": 1,
+              "Pragma:solidity:^0.8.28": 1,
               "UserDefinedTypeName:IProofOfHumanity": 2,
               "FunctionCall:Name:isRegistered": 1,
               "UserDefinedTypeName:IEvidence": 1,
               "Pragma:solidity:>=0.8.0_<0.9.0": 7,
               "ImportDirective:Path:@openzeppelin/contracts/token/ERC20/IERC20.sol": 3,
-              FileLevelConstant: 8,
+              FileLevelConstant: 9,
               "ContractDefinition:Library": 2,
               "FunctionCall:Name:approve": 1,
               "FunctionCall:Name:allowance": 1,
@@ -209035,7 +209032,6 @@
               "FunctionCall:Name:send": 1,
               "FunctionCall:Name:transfer": 1,
               "FunctionCall:Name:blockhash": 1,
-              "ImportDirective:Path:@chainlink/contracts/src/v0.8/vrf/dev/VRFConsumerBaseV2Plus.sol": 1,
               "ImportDirective:Path:@chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol": 1,
               "UserDefinedTypeName:VRFConsumerBaseV2Plus": 1,
               "FunctionCall:Name:requestRandomWords": 1,
@@ -209050,6 +209046,7 @@
               "FunctionCall:Name:delegatecall": 2,
               CatchClause: 1,
               "AssemblyCall:Name:sload": 2,
+              "FunctionCall:Name:require": 1,
               "AssemblyCall:Name:calldatacopy": 1,
               "AssemblyCall:Name:calldatasize": 2,
               "AssemblyCall:Name:delegatecall": 1,
@@ -209066,59 +209063,60 @@
               "FunctionCall:Name:_checkInitializing": 1,
               "FunctionCall:Name:_isInitializing": 1,
               "FunctionCall:Name:type": 3,
+              "FunctionDefinition:Private": 1,
               AssemblyMemberAccess: 1,
             },
             sloc: {
-              total: 5124,
-              source: 2839,
-              comment: 1784,
-              single: 1622,
-              block: 162,
-              mixed: 175,
-              empty: 676,
-              todo: 2,
+              total: 5103,
+              source: 2808,
+              comment: 1802,
+              single: 1635,
+              block: 167,
+              mixed: 184,
+              empty: 677,
+              todo: 3,
               blockEmpty: 0,
-              commentToSourceRatio: 0.6283902782669955,
+              commentToSourceRatio: 0.6417378917378918,
             },
             nsloc: {
-              total: 4587,
-              source: 2437,
-              comment: 1687,
-              single: 1529,
-              block: 158,
-              mixed: 171,
-              empty: 634,
+              total: 4501,
+              source: 2365,
+              comment: 1681,
+              single: 1524,
+              block: 157,
+              mixed: 173,
+              empty: 628,
               todo: 2,
               blockEmpty: 0,
-              commentToSourceRatio: 0.6922445629872794,
+              commentToSourceRatio: 0.7107822410147991,
             },
-            complexity: { perceivedNaiveScore: 1667 },
+            complexity: { perceivedNaiveScore: 1603 },
             summary: {
               perceivedComplexity: 6,
               size: 4,
-              numLogicContracts: 3,
-              numFiles: 4,
+              numLogicContracts: 2,
+              numFiles: 3,
               interfaceRisk: 6,
               inlineDocumentation: 1,
               compilerFeatures: 2,
               compilerVersion: 1,
             },
             num: {
-              astStatements: 14132,
-              contractDefinitions: 36,
-              contracts: 16,
+              astStatements: 13938,
+              contractDefinitions: 32,
+              contracts: 14,
               libraries: 2,
               interfaces: 13,
-              abstract: 5,
-              imports: 51,
-              functionsPublic: 192,
+              abstract: 3,
+              imports: 49,
+              functionsPublic: 191,
               functionsPayable: 10,
-              assemblyBlocks: 12,
-              stateVars: 87,
-              stateVarsPublic: 80,
+              assemblyBlocks: 10,
+              stateVars: 88,
+              stateVarsPublic: 82,
             },
             capabilities: {
-              solidityVersions: ["^0.8.24", ">=0.8.0 <0.9.0"],
+              solidityVersions: ["^0.8.24", "^0.8.28", ">=0.8.0 <0.9.0"],
               assembly: true,
               experimental: [],
               canReceiveFunds: true,
@@ -209166,10 +209164,6 @@
                 {},
                 {},
                 {},
-                {},
-                {},
-                {},
-                {},
               ],
             },
           },
@@ -209177,293 +209171,295 @@
             ast: {
               SourceUnit: 1,
               PragmaDirective: 1,
-              "Pragma:solidity:^0.8.24": 0.7741935483870968,
-              ImportDirective: 1.6451612903225807,
-              StringLiteral: 4.193548387096774,
-              Identifier: 122.16129032258064,
-              ContractDefinition: 1.1612903225806452,
-              "ContractDefinition:Contract": 0.5161290322580645,
-              "ContractDefinition:BaseContracts": 0.967741935483871,
-              InheritanceSpecifier: 0.967741935483871,
-              UserDefinedTypeName: 7.483870967741935,
-              "UserDefinedTypeName:KlerosCoreBase": 0.06451612903225806,
-              StateVariableDeclaration: 2.806451612903226,
-              VariableDeclaration: 38.903225806451616,
-              "StateVariableDeclaration:Public": 2.5806451612903225,
-              "StateVariableDeclaration:Const": 0.6774193548387096,
-              ElementaryTypeName: 34.645161290322584,
-              FunctionDefinition: 8.548387096774194,
-              "FunctionDefinition:Internal": 7,
-              "FunctionDefinition:Default": 0.5161290322580645,
-              Block: 13,
-              ExpressionStatement: 14.741935483870968,
-              FunctionCall: 15.35483870967742,
-              "FunctionCall:Type:Regular": 4.32258064516129,
-              "FunctionCall:Name:_disableInitializers": 0.3870967741935484,
-              "FunctionDefinition:External": 5.645161290322581,
-              "UserDefinedTypeName:IERC20": 0.8387096774193549,
-              "UserDefinedTypeName:IDisputeKit": 0.41935483870967744,
-              "VariableDeclaration:Memory": 1.935483870967742,
-              ArrayTypeName: 1.6129032258064515,
-              NumberLiteral: 8.161290322580646,
-              "UserDefinedTypeName:ISortitionModule": 0.22580645161290322,
-              "FunctionCall:Name:__KlerosCoreBase_initialize": 0.06451612903225806,
-              ModifierInvocation: 3.3225806451612905,
-              BinaryOperation: 21.29032258064516,
-              "FunctionDefinition:View": 2.5806451612903225,
-              "ContractDefinition:Abstract": 0.16129032258064516,
-              "UserDefinedTypeName:IArbitratorV2": 0.1935483870967742,
-              "UserDefinedTypeName:Initializable": 0.1935483870967742,
-              "UserDefinedTypeName:UUPSProxiable": 0.1935483870967742,
-              UsingForDeclaration: 0.0967741935483871,
-              EnumDefinition: 0.12903225806451613,
-              EnumValue: 0.6451612903225806,
-              StructDefinition: 0.41935483870967744,
-              Mapping: 0.7741935483870968,
-              "UserDefinedTypeName:IArbitrableV2": 0.1935483870967742,
-              "UserDefinedTypeName:Period": 0.06451612903225806,
-              "UserDefinedTypeName:Round": 1,
-              "StateVariableDeclaration:Private": 0.1935483870967742,
-              TupleExpression: 1.7419354838709677,
-              "UserDefinedTypeName:Court": 0.2903225806451613,
-              "UserDefinedTypeName:Dispute": 1.1290322580645162,
-              "UserDefinedTypeName:CurrencyRate": 0.03225806451612903,
-              EventDefinition: 1.3870967741935485,
-              "VariableDeclaration:Indexed": 2.3225806451612905,
-              ModifierDefinition: 0.6129032258064516,
-              IfStatement: 5.290322580645161,
-              MemberAccess: 27.225806451612904,
-              RevertStatement: 1.7096774193548387,
-              UnaryOperation: 1.7419354838709677,
-              EmitStatement: 1.6774193548387097,
-              "FunctionCall:Type:MemberAccess": 3.129032258064516,
-              "FunctionCall:Name:createTree": 0.0967741935483871,
-              VariableDeclarationStatement: 7,
-              "VariableDeclaration:Storage": 2.935483870967742,
-              NewExpression: 0.0967741935483871,
-              IndexAccess: 9.516129032258064,
-              "FunctionCall:Name:_enableDisputeKit": 0.12903225806451613,
-              BooleanLiteral: 1.6451612903225807,
-              NameValueExpression: 0.16129032258064516,
-              NameValueList: 0.16129032258064516,
-              ForStatement: 0.3225806451612903,
-              "FunctionCall:Name:_setStake": 0.12903225806451613,
-              "FunctionCall:Name:address": 0.9032258064516129,
-              "FunctionCall:Name:safeTransfer": 0.1935483870967742,
-              "FunctionDefinition:Payable": 0.3225806451612903,
-              "FunctionCall:Name:arbitrationCost": 0.0967741935483871,
-              ReturnStatement: 2.4838709677419355,
-              "FunctionCall:Name:_createDispute": 0.16129032258064516,
-              "VariableDeclaration:Calldata": 0.8709677419354839,
-              "FunctionCall:Name:safeTransferFrom": 0.06451612903225806,
-              "FunctionCall:Name:_extraDataToCourtIDMinJurorsDisputeKit": 0.06451612903225806,
-              Conditional: 0.3548387096774194,
-              "FunctionCall:Name:convertEthToTokenAmount": 0.06451612903225806,
-              "FunctionCall:Name:_calculatePnkAtStake": 0.06451612903225806,
-              "FunctionCall:Name:createDisputeHook": 0.06451612903225806,
-              "FunctionCall:Name:createDispute": 0.06451612903225806,
-              "FunctionCall:Name:areCommitsAllCast": 0.03225806451612903,
-              "FunctionCall:Name:areVotesAllCast": 0.03225806451612903,
-              "FunctionCall:Name:isAppealFunded": 0.03225806451612903,
-              WhileStatement: 0.12903225806451613,
-              "FunctionCall:Name:draw": 0.06451612903225806,
-              ContinueStatement: 0.03225806451612903,
-              "FunctionCall:Name:lockStake": 0.03225806451612903,
-              "FunctionCall:Name:postDrawHook": 0.03225806451612903,
-              "FunctionCall:Name:appealCost": 0.06451612903225806,
-              "FunctionCall:Name:getCoherentCount": 0.03225806451612903,
-              "FunctionCall:Name:_executePenalties": 0.03225806451612903,
-              "FunctionCall:Name:_executeRewards": 0.03225806451612903,
-              "UserDefinedTypeName:ExecuteParams": 0.06451612903225806,
-              "FunctionCall:Name:getDegreeOfCoherence": 0.06451612903225806,
-              "FunctionCall:Name:unlockStake": 0.06451612903225806,
-              "FunctionCall:Name:penalizeStake": 0.03225806451612903,
-              "FunctionCall:Name:isVoteActive": 0.03225806451612903,
-              "FunctionCall:Name:setJurorInactive": 0.03225806451612903,
-              "FunctionCall:Name:_transferFeeToken": 0.0967741935483871,
-              "FunctionCall:Name:payable": 0.12903225806451613,
-              "FunctionCall:Name:_applyCoherence": 0.0967741935483871,
-              "FunctionCall:Name:currentRuling": 0.1935483870967742,
-              "FunctionCall:Name:rule": 0.03225806451612903,
-              "FunctionDefinition:Public": 0.5483870967741935,
-              "FunctionCall:Name:safeSend": 0.0967741935483871,
-              "FunctionDefinition:Pure": 0.41935483870967744,
-              "UserDefinedTypeName:OnError": 0.0967741935483871,
-              "FunctionCall:Name:_stakingFailed": 0.1935483870967742,
-              "UserDefinedTypeName:StakingResult": 0.22580645161290322,
-              "FunctionCall:Name:validateStake": 0.03225806451612903,
-              "FunctionCall:Name:setStake": 0.03225806451612903,
-              InlineAssemblyStatement: 0.3870967741935484,
-              AssemblyBlock: 0.7419354838709677,
-              AssemblyAssignment: 0.5806451612903226,
-              AssemblyCall: 3.193548387096774,
-              "AssemblyCall:Name:mload": 0.3870967741935484,
-              "AssemblyCall:Name:add": 0.5161290322580645,
-              HexNumber: 0.7419354838709677,
-              CustomErrorDefinition: 1.4516129032258065,
-              "ImportDirective:Path:@openzeppelin/contracts/token/ERC721/IERC721.sol": 0.03225806451612903,
-              "UserDefinedTypeName:IERC721": 0.0967741935483871,
-              "FunctionCall:Name:balanceOf": 0.16129032258064516,
-              "FunctionCall:Type:BuiltIn": 1.8387096774193548,
-              "FunctionCall:Name:require": 1.6451612903225807,
-              "UserDefinedTypeName:SortitionModuleBase": 0.06451612903225806,
-              "UserDefinedTypeName:KlerosCore": 0.3548387096774194,
-              "UserDefinedTypeName:IRNG": 0.2903225806451613,
-              "FunctionCall:Name:__SortitionModuleBase_initialize": 0.06451612903225806,
-              "UserDefinedTypeName:Phase": 0.06451612903225806,
-              "StateVariableDeclaration:Default": 0.03225806451612903,
-              "UserDefinedTypeName:SortitionSumTree": 0.1935483870967742,
-              "UserDefinedTypeName:Juror": 0.25806451612903225,
-              "UserDefinedTypeName:DelayedStake": 0.0967741935483871,
-              "FunctionCall:Name:requestRandomness": 0.0967741935483871,
-              "FunctionCall:Name:receiveRandomness": 0.06451612903225806,
-              "FunctionCall:Name:_extraDataToTreeK": 0.03225806451612903,
-              "FunctionCall:Name:setStakeBySortitionModule": 0.06451612903225806,
-              "FunctionCall:Name:_validateStake": 0.06451612903225806,
-              "FunctionCall:Name:stakeOf": 0.16129032258064516,
-              BreakStatement: 0.06451612903225806,
-              "FunctionCall:Name:_accountAndCourtIDToStakePathID": 0.06451612903225806,
-              "FunctionCall:Name:_set": 0.03225806451612903,
-              "FunctionCall:Name:courts": 0.0967741935483871,
-              "FunctionCall:Name:getJurorLeftoverPNK": 0.06451612903225806,
-              "FunctionCall:Name:getJurorCourtIDs": 0.03225806451612903,
-              "FunctionCall:Name:transferBySortitionModule": 0.03225806451612903,
-              "FunctionCall:Name:keccak256": 0.1935483870967742,
-              "FunctionCall:Name:encodePacked": 0.06451612903225806,
-              "FunctionCall:Name:_stakePathIDToAccount": 0.03225806451612903,
-              "FunctionDefinition:Private": 0.06451612903225806,
-              AssemblyLocalDefinition: 0.25806451612903225,
-              AssemblyFor: 0.0967741935483871,
-              "AssemblyCall:Name:lt": 0.0967741935483871,
-              "AssemblyCall:Name:mstore8": 0.0967741935483871,
-              "AssemblyCall:Name:byte": 0.0967741935483871,
-              "FunctionCall:Name:_updateParents": 0.0967741935483871,
-              "UserDefinedTypeName:IDisputeTemplateRegistry": 0.12903225806451613,
-              "UserDefinedTypeName:DisputeStruct": 0.06451612903225806,
-              "FunctionCall:Name:setDisputeTemplate": 0.03225806451612903,
-              "UserDefinedTypeName:DisputeKitClassicBase": 0.16129032258064516,
-              "FunctionCall:Name:__DisputeKitClassicBase_initialize": 0.16129032258064516,
-              "UserDefinedTypeName:Vote": 0.12903225806451613,
-              "FunctionCall:Name:getNumberOfRounds": 0.06451612903225806,
-              "FunctionCall:Name:sortitionModule": 0.03225806451612903,
-              "FunctionCall:Name:disputes": 0.22580645161290322,
-              "FunctionCall:Name:_postDrawCheck": 0.12903225806451613,
-              "FunctionCall:Name:_castCommit": 0.0967741935483871,
-              "UserDefinedTypeName:KlerosCore.Period": 0.0967741935483871,
-              "FunctionCall:Name:_castVote": 0.0967741935483871,
-              "FunctionCall:Name:hashVote": 0.03225806451612903,
-              "FunctionCall:Name:appealPeriod": 0.06451612903225806,
-              "FunctionCall:Name:isDisputeKitJumping": 0.03225806451612903,
-              "FunctionCall:Name:getNumberOfVotes": 0.03225806451612903,
-              "FunctionCall:Name:paused": 0.03225806451612903,
-              "FunctionCall:Name:getFundedChoices": 0.06451612903225806,
-              "ContractDefinition:Interface": 0.41935483870967744,
-              "AssemblyCall:Name:and": 0.12903225806451613,
-              "AssemblyCall:Name:shr": 0.06451612903225806,
-              DecimalNumber: 0.45161290322580644,
-              "FunctionCall:Name:extraDataToTokenInfo": 0.03225806451612903,
-              "FunctionCall:Type:ContractTypecast": 0.1935483870967742,
-              "FunctionCall:Name:encode": 0.06451612903225806,
-              "FunctionCall:Name:_extraDataToTokenInfo": 0.03225806451612903,
-              "UserDefinedTypeName:IProofOfHumanity": 0.06451612903225806,
-              "FunctionCall:Name:isRegistered": 0.03225806451612903,
-              "UserDefinedTypeName:IEvidence": 0.03225806451612903,
-              "Pragma:solidity:>=0.8.0_<0.9.0": 0.22580645161290322,
-              "ImportDirective:Path:@openzeppelin/contracts/token/ERC20/IERC20.sol": 0.0967741935483871,
-              FileLevelConstant: 0.25806451612903225,
-              "ContractDefinition:Library": 0.06451612903225806,
-              "FunctionCall:Name:approve": 0.03225806451612903,
-              "FunctionCall:Name:allowance": 0.03225806451612903,
-              "FunctionCall:Name:call": 0.06451612903225806,
-              "FunctionCall:Name:encodeCall": 0.06451612903225806,
-              "FunctionCall:Name:decode": 0.06451612903225806,
-              "FunctionCall:Name:send": 0.03225806451612903,
-              "FunctionCall:Name:transfer": 0.03225806451612903,
-              "FunctionCall:Name:blockhash": 0.03225806451612903,
-              "ImportDirective:Path:@chainlink/contracts/src/v0.8/vrf/dev/VRFConsumerBaseV2Plus.sol": 0.03225806451612903,
-              "ImportDirective:Path:@chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol": 0.03225806451612903,
-              "UserDefinedTypeName:VRFConsumerBaseV2Plus": 0.03225806451612903,
-              "FunctionCall:Name:requestRandomWords": 0.03225806451612903,
-              "FunctionCall:Name:RandomWordsRequest": 0.03225806451612903,
-              "FunctionCall:Name:_argsToBytes": 0.03225806451612903,
-              "FunctionCall:Name:ExtraArgsV1": 0.03225806451612903,
-              "FunctionCall:Name:_authorizeUpgrade": 0.03225806451612903,
-              "FunctionCall:Name:_getImplementation": 0.0967741935483871,
-              TryStatement: 0.03225806451612903,
-              "FunctionCall:Name:proxiableUUID": 0.03225806451612903,
-              "AssemblyCall:Name:sstore": 0.06451612903225806,
-              "FunctionCall:Name:delegatecall": 0.06451612903225806,
-              CatchClause: 0.03225806451612903,
-              "AssemblyCall:Name:sload": 0.06451612903225806,
-              "AssemblyCall:Name:calldatacopy": 0.03225806451612903,
-              "AssemblyCall:Name:calldatasize": 0.06451612903225806,
-              "AssemblyCall:Name:delegatecall": 0.03225806451612903,
-              "AssemblyCall:Name:gas": 0.03225806451612903,
-              "AssemblyCall:Name:returndatacopy": 0.03225806451612903,
-              "AssemblyCall:Name:returndatasize": 0.0967741935483871,
-              AssemblySwitch: 0.03225806451612903,
-              AssemblyCase: 0.06451612903225806,
-              "AssemblyCall:Name:revert": 0.03225806451612903,
-              "AssemblyCall:Name:return": 0.03225806451612903,
-              "FunctionCall:Name:_delegate": 0.06451612903225806,
-              "UserDefinedTypeName:InitializableStorage": 0.12903225806451613,
-              "FunctionCall:Name:_getInitializableStorage": 0.16129032258064516,
-              "FunctionCall:Name:_checkInitializing": 0.03225806451612903,
-              "FunctionCall:Name:_isInitializing": 0.03225806451612903,
-              "FunctionCall:Name:type": 0.0967741935483871,
-              AssemblyMemberAccess: 0.03225806451612903,
+              "Pragma:solidity:^0.8.24": 0.7037037037037037,
+              ImportDirective: 1.8148148148148149,
+              StringLiteral: 2.740740740740741,
+              Identifier: 139.8148148148148,
+              "ImportDirective:Path:@openzeppelin/contracts/token/ERC721/IERC721.sol": 0.037037037037037035,
+              ContractDefinition: 1.1851851851851851,
+              "ContractDefinition:Contract": 0.5185185185185185,
+              "ContractDefinition:BaseContracts": 0.9629629629629629,
+              InheritanceSpecifier: 0.9629629629629629,
+              UserDefinedTypeName: 8.333333333333334,
+              "UserDefinedTypeName:IArbitratorV2": 0.2222222222222222,
+              "UserDefinedTypeName:Initializable": 0.2222222222222222,
+              "UserDefinedTypeName:UUPSProxiable": 0.2222222222222222,
+              UsingForDeclaration: 0.18518518518518517,
+              "UserDefinedTypeName:IERC20": 0.8518518518518519,
+              ElementaryTypeName: 40.629629629629626,
+              StateVariableDeclaration: 3.259259259259259,
+              VariableDeclaration: 45.44444444444444,
+              "StateVariableDeclaration:Public": 3.037037037037037,
+              "StateVariableDeclaration:Const": 0.6296296296296297,
+              EnumDefinition: 0.14814814814814814,
+              EnumValue: 0.7407407407407407,
+              StructDefinition: 0.4444444444444444,
+              ArrayTypeName: 1.6666666666666667,
+              NumberLiteral: 7.888888888888889,
+              Mapping: 1.0740740740740742,
+              "UserDefinedTypeName:IArbitrableV2": 0.2222222222222222,
+              "UserDefinedTypeName:Period": 0.07407407407407407,
+              "UserDefinedTypeName:Round": 1.2222222222222223,
+              "StateVariableDeclaration:Private": 0.18518518518518517,
+              BinaryOperation: 23.666666666666668,
+              TupleExpression: 1.8888888888888888,
+              "UserDefinedTypeName:ISortitionModule": 0.18518518518518517,
+              "UserDefinedTypeName:Court": 0.4074074074074074,
+              "UserDefinedTypeName:IDisputeKit": 0.48148148148148145,
+              "UserDefinedTypeName:Dispute": 1.4074074074074074,
+              "UserDefinedTypeName:CurrencyRate": 0.037037037037037035,
+              "UserDefinedTypeName:IERC721": 0.1111111111111111,
+              EventDefinition: 1.5925925925925926,
+              "VariableDeclaration:Indexed": 2.6666666666666665,
+              ModifierDefinition: 0.7037037037037037,
+              Block: 14.296296296296296,
+              IfStatement: 7.962962962962963,
+              MemberAccess: 30.48148148148148,
+              RevertStatement: 3.814814814814815,
+              FunctionCall: 17.703703703703702,
+              ExpressionStatement: 14.407407407407407,
+              UnaryOperation: 2.074074074074074,
+              FunctionDefinition: 9.518518518518519,
+              "FunctionDefinition:Internal": 7.296296296296297,
+              "FunctionDefinition:Default": 0.5185185185185185,
+              "FunctionCall:Type:Regular": 4.888888888888889,
+              "FunctionCall:Name:_disableInitializers": 0.37037037037037035,
+              "FunctionDefinition:External": 6.481481481481482,
+              "VariableDeclaration:Memory": 1.962962962962963,
+              EmitStatement: 1.9259259259259258,
+              "FunctionCall:Type:MemberAccess": 4.185185185185185,
+              "FunctionCall:Name:createTree": 0.14814814814814814,
+              VariableDeclarationStatement: 7.962962962962963,
+              "VariableDeclaration:Storage": 3.4074074074074074,
+              NewExpression: 0.1111111111111111,
+              IndexAccess: 11,
+              "FunctionCall:Name:_enableDisputeKit": 0.14814814814814814,
+              BooleanLiteral: 2.259259259259259,
+              ModifierInvocation: 3.259259259259259,
+              "FunctionDefinition:View": 3.4074074074074074,
+              NameValueExpression: 0.18518518518518517,
+              NameValueList: 0.18518518518518517,
+              ForStatement: 0.4074074074074074,
+              "FunctionCall:Name:address": 1.037037037037037,
+              "FunctionCall:Name:balanceOf": 0.18518518518518517,
+              "FunctionCall:Name:_setStake": 0.18518518518518517,
+              "FunctionCall:Name:safeTransfer": 0.2222222222222222,
+              "FunctionDefinition:Payable": 0.37037037037037035,
+              "FunctionCall:Name:arbitrationCost": 0.1111111111111111,
+              ReturnStatement: 3.3333333333333335,
+              "FunctionCall:Name:_createDispute": 0.14814814814814814,
+              "VariableDeclaration:Calldata": 1,
+              "FunctionCall:Name:safeTransferFrom": 0.07407407407407407,
+              "FunctionCall:Name:_extraDataToCourtIDMinJurorsDisputeKit": 0.07407407407407407,
+              Conditional: 0.4074074074074074,
+              "FunctionCall:Name:convertEthToTokenAmount": 0.07407407407407407,
+              "FunctionCall:Name:_calculatePnkAtStake": 0.07407407407407407,
+              "FunctionCall:Name:createDisputeHook": 0.07407407407407407,
+              "FunctionCall:Name:createDispute": 0.07407407407407407,
+              "FunctionCall:Name:areVotesAllCast": 0.037037037037037035,
+              "FunctionCall:Name:isAppealFunded": 0.037037037037037035,
+              WhileStatement: 0.07407407407407407,
+              "FunctionCall:Name:draw": 0.1111111111111111,
+              ContinueStatement: 0.037037037037037035,
+              "FunctionCall:Name:lockStake": 0.037037037037037035,
+              "FunctionCall:Name:postDrawHook": 0.037037037037037035,
+              "FunctionCall:Name:appealCost": 0.07407407407407407,
+              "FunctionCall:Name:_getCourtAndDisputeKitJumps": 0.07407407407407407,
+              "FunctionCall:Name:getCoherentCount": 0.037037037037037035,
+              "FunctionCall:Name:_executePenalties": 0.037037037037037035,
+              "FunctionCall:Name:_executeRewards": 0.037037037037037035,
+              "UserDefinedTypeName:ExecuteParams": 0.07407407407407407,
+              "FunctionCall:Name:getDegreeOfCoherencePenalty": 0.037037037037037035,
+              "FunctionCall:Name:unlockStake": 0.07407407407407407,
+              "FunctionCall:Name:setStakePenalty": 0.037037037037037035,
+              "FunctionCall:Name:isVoteActive": 0.037037037037037035,
+              "FunctionCall:Name:forcedUnstakeAllCourts": 0.037037037037037035,
+              "FunctionCall:Name:forcedUnstake": 0.037037037037037035,
+              "FunctionCall:Name:_transferFeeToken": 0.1111111111111111,
+              "FunctionCall:Name:payable": 0.14814814814814814,
+              "FunctionCall:Name:getDegreeOfCoherenceReward": 0.037037037037037035,
+              "FunctionCall:Name:_applyCoherence": 0.1111111111111111,
+              "FunctionCall:Name:setStakeReward": 0.037037037037037035,
+              "FunctionCall:Name:currentRuling": 0.2222222222222222,
+              "FunctionCall:Name:rule": 0.037037037037037035,
+              "FunctionDefinition:Public": 0.5925925925925926,
+              "FunctionCall:Name:getNbVotesAfterAppeal": 0.037037037037037035,
+              "FunctionCall:Name:_isCourtJumping": 0.07407407407407407,
+              "FunctionCall:Name:earlyCourtJump": 0.037037037037037035,
+              "FunctionCall:Name:getJumpDisputeKitID": 0.037037037037037035,
+              "FunctionCall:Name:safeSend": 0.1111111111111111,
+              "FunctionDefinition:Pure": 0.3333333333333333,
+              "UserDefinedTypeName:OnError": 0.07407407407407407,
+              "FunctionCall:Name:_stakingFailed": 0.18518518518518517,
+              "UserDefinedTypeName:StakingResult": 0.18518518518518517,
+              "FunctionCall:Name:validateStake": 0.037037037037037035,
+              "FunctionCall:Name:setStake": 0.037037037037037035,
+              InlineAssemblyStatement: 0.37037037037037035,
+              AssemblyBlock: 0.4444444444444444,
+              AssemblyAssignment: 0.48148148148148145,
+              AssemblyCall: 2.1481481481481484,
+              "AssemblyCall:Name:mload": 0.2962962962962963,
+              "AssemblyCall:Name:add": 0.2962962962962963,
+              HexNumber: 0.37037037037037035,
+              CustomErrorDefinition: 3.185185185185185,
+              "UserDefinedTypeName:SortitionTrees.Tree": 0.1111111111111111,
+              "UserDefinedTypeName:TreeKey": 0.2222222222222222,
+              "UserDefinedTypeName:KlerosCore": 0.3333333333333333,
+              "UserDefinedTypeName:Phase": 0.07407407407407407,
+              "UserDefinedTypeName:IRNG": 0.25925925925925924,
+              "StateVariableDeclaration:Default": 0.037037037037037035,
+              "UserDefinedTypeName:Juror": 0.25925925925925924,
+              "UserDefinedTypeName:DelayedStake": 0.1111111111111111,
+              "FunctionCall:Name:requestRandomness": 0.1111111111111111,
+              "FunctionCall:Name:receiveRandomness": 0.07407407407407407,
+              "FunctionCall:Name:toTreeKey": 0.14814814814814814,
+              "FunctionCall:Name:wrap": 0.14814814814814814,
+              "FunctionCall:Name:_extraDataToTreeK": 0.037037037037037035,
+              "FunctionCall:Name:setStakeBySortitionModule": 0.1111111111111111,
+              "FunctionCall:Name:_validateStake": 0.037037037037037035,
+              "FunctionCall:Name:stakeOf": 0.2962962962962963,
+              BreakStatement: 0.037037037037037035,
+              "FunctionCall:Name:toStakePathID": 0.07407407407407407,
+              "FunctionCall:Name:set": 0.037037037037037035,
+              "FunctionCall:Name:courts": 0.1111111111111111,
+              "FunctionCall:Name:getJurorLeftoverPNK": 0.07407407407407407,
+              "FunctionCall:Name:getJurorCourtIDs": 0.037037037037037035,
+              "FunctionCall:Name:transferBySortitionModule": 0.037037037037037035,
+              "UserDefinedTypeName:IDisputeTemplateRegistry": 0.14814814814814814,
+              "UserDefinedTypeName:DisputeStruct": 0.07407407407407407,
+              "FunctionCall:Name:setDisputeTemplate": 0.037037037037037035,
+              "UserDefinedTypeName:DisputeKitClassicBase": 0.18518518518518517,
+              "FunctionCall:Name:__DisputeKitClassicBase_initialize": 0.18518518518518517,
+              "ContractDefinition:Abstract": 0.1111111111111111,
+              "UserDefinedTypeName:Vote": 0.14814814814814814,
+              "FunctionCall:Name:getNumberOfRounds": 0.07407407407407407,
+              "FunctionCall:Name:sortitionModule": 0.037037037037037035,
+              "FunctionCall:Name:disputes": 0.25925925925925924,
+              "FunctionCall:Name:_postDrawCheck": 0.14814814814814814,
+              "FunctionCall:Name:_castCommit": 0.1111111111111111,
+              "UserDefinedTypeName:KlerosCore.Period": 0.1111111111111111,
+              "FunctionCall:Name:_castVote": 0.1111111111111111,
+              "FunctionCall:Name:hashVote": 0.037037037037037035,
+              "FunctionCall:Name:_getExpectedVoteHash": 0.037037037037037035,
+              "FunctionCall:Name:appealPeriod": 0.07407407407407407,
+              "FunctionCall:Name:isDisputeKitJumping": 0.037037037037037035,
+              "FunctionCall:Name:getNumberOfVotes": 0.037037037037037035,
+              "FunctionCall:Name:paused": 0.037037037037037035,
+              "FunctionCall:Type:BuiltIn": 0.2962962962962963,
+              "FunctionCall:Name:keccak256": 0.25925925925925924,
+              "FunctionCall:Name:encodePacked": 0.1111111111111111,
+              "FunctionCall:Name:getFundedChoices": 0.07407407407407407,
+              "FunctionCall:Name:_getDegreeOfCoherence": 0.07407407407407407,
+              "ContractDefinition:Interface": 0.48148148148148145,
+              AssemblyLocalDefinition: 0.1111111111111111,
+              "AssemblyCall:Name:and": 0.14814814814814814,
+              "AssemblyCall:Name:shr": 0.07407407407407407,
+              DecimalNumber: 0.5185185185185185,
+              "FunctionCall:Name:extraDataToTokenInfo": 0.037037037037037035,
+              "FunctionCall:Type:ContractTypecast": 0.2222222222222222,
+              "FunctionCall:Name:encode": 0.07407407407407407,
+              "FunctionCall:Name:_extraDataToTokenInfo": 0.037037037037037035,
+              "Pragma:solidity:^0.8.28": 0.037037037037037035,
+              "UserDefinedTypeName:IProofOfHumanity": 0.07407407407407407,
+              "FunctionCall:Name:isRegistered": 0.037037037037037035,
+              "UserDefinedTypeName:IEvidence": 0.037037037037037035,
+              "Pragma:solidity:>=0.8.0_<0.9.0": 0.25925925925925924,
+              "ImportDirective:Path:@openzeppelin/contracts/token/ERC20/IERC20.sol": 0.1111111111111111,
+              FileLevelConstant: 0.3333333333333333,
+              "ContractDefinition:Library": 0.07407407407407407,
+              "FunctionCall:Name:approve": 0.037037037037037035,
+              "FunctionCall:Name:allowance": 0.037037037037037035,
+              "FunctionCall:Name:call": 0.07407407407407407,
+              "FunctionCall:Name:encodeCall": 0.07407407407407407,
+              "FunctionCall:Name:decode": 0.07407407407407407,
+              "FunctionCall:Name:send": 0.037037037037037035,
+              "FunctionCall:Name:transfer": 0.037037037037037035,
+              "FunctionCall:Name:blockhash": 0.037037037037037035,
+              "ImportDirective:Path:@chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol": 0.037037037037037035,
+              "UserDefinedTypeName:VRFConsumerBaseV2Plus": 0.037037037037037035,
+              "FunctionCall:Name:requestRandomWords": 0.037037037037037035,
+              "FunctionCall:Name:RandomWordsRequest": 0.037037037037037035,
+              "FunctionCall:Name:_argsToBytes": 0.037037037037037035,
+              "FunctionCall:Name:ExtraArgsV1": 0.037037037037037035,
+              "FunctionCall:Name:_authorizeUpgrade": 0.037037037037037035,
+              "FunctionCall:Name:_getImplementation": 0.1111111111111111,
+              TryStatement: 0.037037037037037035,
+              "FunctionCall:Name:proxiableUUID": 0.037037037037037035,
+              "AssemblyCall:Name:sstore": 0.07407407407407407,
+              "FunctionCall:Name:delegatecall": 0.07407407407407407,
+              CatchClause: 0.037037037037037035,
+              "AssemblyCall:Name:sload": 0.07407407407407407,
+              "FunctionCall:Name:require": 0.037037037037037035,
+              "AssemblyCall:Name:calldatacopy": 0.037037037037037035,
+              "AssemblyCall:Name:calldatasize": 0.07407407407407407,
+              "AssemblyCall:Name:delegatecall": 0.037037037037037035,
+              "AssemblyCall:Name:gas": 0.037037037037037035,
+              "AssemblyCall:Name:returndatacopy": 0.037037037037037035,
+              "AssemblyCall:Name:returndatasize": 0.1111111111111111,
+              AssemblySwitch: 0.037037037037037035,
+              AssemblyCase: 0.07407407407407407,
+              "AssemblyCall:Name:revert": 0.037037037037037035,
+              "AssemblyCall:Name:return": 0.037037037037037035,
+              "FunctionCall:Name:_delegate": 0.07407407407407407,
+              "UserDefinedTypeName:InitializableStorage": 0.14814814814814814,
+              "FunctionCall:Name:_getInitializableStorage": 0.18518518518518517,
+              "FunctionCall:Name:_checkInitializing": 0.037037037037037035,
+              "FunctionCall:Name:_isInitializing": 0.037037037037037035,
+              "FunctionCall:Name:type": 0.1111111111111111,
+              "FunctionDefinition:Private": 0.037037037037037035,
+              AssemblyMemberAccess: 0.037037037037037035,
             },
             sloc: {
-              total: 165.29032258064515,
-              source: 91.58064516129032,
-              comment: 57.54838709677419,
-              single: 52.32258064516129,
-              block: 5.225806451612903,
-              mixed: 5.645161290322581,
-              empty: 21.806451612903224,
-              todo: 0.06451612903225806,
+              total: 189,
+              source: 104,
+              comment: 66.74074074074075,
+              single: 60.55555555555556,
+              block: 6.185185185185185,
+              mixed: 6.814814814814815,
+              empty: 25.074074074074073,
+              todo: 0.1111111111111111,
               blockEmpty: 0,
-              commentToSourceRatio: 0.9784907999489301,
+              commentToSourceRatio: 1.0155317212422816,
             },
             nsloc: {
-              total: 147.96774193548387,
-              source: 78.61290322580645,
-              comment: 54.41935483870968,
-              single: 49.32258064516129,
-              block: 5.096774193548387,
-              mixed: 5.516129032258065,
-              empty: 20.451612903225808,
-              todo: 0.06451612903225806,
+              total: 166.7037037037037,
+              source: 87.5925925925926,
+              comment: 62.25925925925926,
+              single: 56.44444444444444,
+              block: 5.814814814814815,
+              mixed: 6.407407407407407,
+              empty: 23.25925925925926,
+              todo: 0.07407407407407407,
               blockEmpty: 0,
-              commentToSourceRatio: 1.1404911436132485,
+              commentToSourceRatio: 1.1998123773006808,
             },
-            complexity: { perceivedNaiveScore: 53.77419354838709 },
+            complexity: { perceivedNaiveScore: 59.370370370370374 },
             summary: {
               perceivedComplexity: 2,
               size: 1,
               numLogicContracts: 1,
-              numFiles: 0.12903225806451613,
+              numFiles: 0.1111111111111111,
               interfaceRisk: 2,
               inlineDocumentation: 1,
               compilerFeatures: 1,
               compilerVersion: 1,
             },
             num: {
-              astStatements: 455.8709677419355,
-              contractDefinitions: 1.1612903225806452,
-              contracts: 0.5161290322580645,
-              libraries: 0.06451612903225806,
-              interfaces: 0.41935483870967744,
-              abstract: 0.16129032258064516,
-              imports: 1.6451612903225807,
-              functionsPublic: 6.193548387096774,
-              functionsPayable: 0.3225806451612903,
-              assemblyBlocks: 0.3870967741935484,
-              stateVars: 2.806451612903226,
-              stateVarsPublic: 2.5806451612903225,
+              astStatements: 516.2222222222222,
+              contractDefinitions: 1.1851851851851851,
+              contracts: 0.5185185185185185,
+              libraries: 0.07407407407407407,
+              interfaces: 0.48148148148148145,
+              abstract: 0.1111111111111111,
+              imports: 1.8148148148148149,
+              functionsPublic: 7.074074074074074,
+              functionsPayable: 0.37037037037037035,
+              assemblyBlocks: 0.37037037037037035,
+              stateVars: 3.259259259259259,
+              stateVarsPublic: 3.037037037037037,
             },
             capabilities: {
-              explicitValueTransfer: 0.03225806451612903,
+              explicitValueTransfer: 0.037037037037037035,
               assembly: true,
               canReceiveFunds: true,
               destroyable: false,
@@ -209477,14 +209473,12 @@
             },
             other: {},
           },
-          num: { sourceUnits: 31, metrics: 31, duplicates: 0, errors: 0 },
+          num: { sourceUnits: 27, metrics: 27, duplicates: 0, errors: 0 },
           other: {
             deployableContracts: [
               "KlerosCore",
-              "KlerosCoreNeo",
               "PolicyRegistry",
               "SortitionModule",
-              "SortitionModuleNeo",
               "DisputeResolver",
               "DisputeTemplateRegistry",
               "DisputeKitClassic",
@@ -209501,9 +209495,9 @@
         },
         dotGraphs: {
           "#surya-inheritance":
-            'digraph G {\n  graph [ ratio = "auto", page = "40" ];\n  "KlerosCore";\n  "KlerosCoreBase";\n  "IArbitratorV2";\n  "Initializable";\n  "UUPSProxiable";\n  "KlerosCoreNeo";\n  "PolicyRegistry";\n  "SortitionModule";\n  "SortitionModuleBase";\n  "ISortitionModule";\n  "SortitionModuleNeo";\n  "DisputeResolver";\n  "IArbitrableV2";\n  "DisputeTemplateRegistry";\n  "IDisputeTemplateRegistry";\n  "DisputeKitClassic";\n  "DisputeKitClassicBase";\n  "IDisputeKit";\n  "IBalanceHolder";\n  "IBalanceHolderERC1155";\n  "DisputeKitGated";\n  "DisputeKitGatedShutter";\n  "DisputeKitShutter";\n  "IProofOfHumanity";\n  "DisputeKitSybilResistant";\n  "EvidenceModule";\n  "IEvidence";\n  "SafeERC20";\n  "WethLike";\n  "SafeSend";\n  "RNGWithFallback";\n  "IRNG";\n  "ChainlinkRNG";\n  "VRFConsumerBaseV2Plus";\n  "UUPSProxy";\n  "KlerosCore" -> "KlerosCoreBase";\n  "KlerosCoreBase" -> "IArbitratorV2";\n  "KlerosCoreBase" -> "Initializable";\n  "KlerosCoreBase" -> "UUPSProxiable";\n  "KlerosCoreNeo" -> "KlerosCoreBase";\n  "PolicyRegistry" -> "UUPSProxiable";\n  "PolicyRegistry" -> "Initializable";\n  "SortitionModule" -> "SortitionModuleBase";\n  "SortitionModuleBase" -> "ISortitionModule";\n  "SortitionModuleBase" -> "Initializable";\n  "SortitionModuleBase" -> "UUPSProxiable";\n  "SortitionModuleNeo" -> "SortitionModuleBase";\n  "DisputeResolver" -> "IArbitrableV2";\n  "DisputeTemplateRegistry" -> "IDisputeTemplateRegistry";\n  "DisputeTemplateRegistry" -> "UUPSProxiable";\n  "DisputeTemplateRegistry" -> "Initializable";\n  "DisputeKitClassic" -> "DisputeKitClassicBase";\n  "DisputeKitClassicBase" -> "IDisputeKit";\n  "DisputeKitClassicBase" -> "Initializable";\n  "DisputeKitClassicBase" -> "UUPSProxiable";\n  "DisputeKitGated" -> "DisputeKitClassicBase";\n  "DisputeKitGatedShutter" -> "DisputeKitClassicBase";\n  "DisputeKitShutter" -> "DisputeKitClassicBase";\n  "DisputeKitSybilResistant" -> "DisputeKitClassicBase";\n  "EvidenceModule" -> "IEvidence";\n  "EvidenceModule" -> "Initializable";\n  "EvidenceModule" -> "UUPSProxiable";\n  "RNGWithFallback" -> "IRNG";\n  "ChainlinkRNG" -> "IRNG";\n  "ChainlinkRNG" -> "VRFConsumerBaseV2Plus";\n}\n',
+            'digraph G {\n  graph [ ratio = "auto", page = "40" ];\n  "KlerosCore";\n  "IArbitratorV2";\n  "Initializable";\n  "UUPSProxiable";\n  "PolicyRegistry";\n  "SortitionModule";\n  "ISortitionModule";\n  "DisputeResolver";\n  "IArbitrableV2";\n  "DisputeTemplateRegistry";\n  "IDisputeTemplateRegistry";\n  "DisputeKitClassic";\n  "DisputeKitClassicBase";\n  "IDisputeKit";\n  "IBalanceHolder";\n  "IBalanceHolderERC1155";\n  "DisputeKitGated";\n  "DisputeKitGatedShutter";\n  "DisputeKitShutter";\n  "IProofOfHumanity";\n  "DisputeKitSybilResistant";\n  "EvidenceModule";\n  "IEvidence";\n  "SafeERC20";\n  "WethLike";\n  "SafeSend";\n  "RNGWithFallback";\n  "IRNG";\n  "ChainlinkRNG";\n  "VRFConsumerBaseV2Plus";\n  "UUPSProxy";\n  "KlerosCore" -> "IArbitratorV2";\n  "KlerosCore" -> "Initializable";\n  "KlerosCore" -> "UUPSProxiable";\n  "PolicyRegistry" -> "UUPSProxiable";\n  "PolicyRegistry" -> "Initializable";\n  "SortitionModule" -> "ISortitionModule";\n  "SortitionModule" -> "Initializable";\n  "SortitionModule" -> "UUPSProxiable";\n  "DisputeResolver" -> "IArbitrableV2";\n  "DisputeTemplateRegistry" -> "IDisputeTemplateRegistry";\n  "DisputeTemplateRegistry" -> "UUPSProxiable";\n  "DisputeTemplateRegistry" -> "Initializable";\n  "DisputeKitClassic" -> "DisputeKitClassicBase";\n  "DisputeKitClassicBase" -> "IDisputeKit";\n  "DisputeKitClassicBase" -> "Initializable";\n  "DisputeKitClassicBase" -> "UUPSProxiable";\n  "DisputeKitGated" -> "DisputeKitClassicBase";\n  "DisputeKitGatedShutter" -> "DisputeKitClassicBase";\n  "DisputeKitShutter" -> "DisputeKitClassicBase";\n  "DisputeKitSybilResistant" -> "DisputeKitClassicBase";\n  "EvidenceModule" -> "IEvidence";\n  "EvidenceModule" -> "Initializable";\n  "EvidenceModule" -> "UUPSProxiable";\n  "RNGWithFallback" -> "IRNG";\n  "ChainlinkRNG" -> "IRNG";\n  "ChainlinkRNG" -> "VRFConsumerBaseV2Plus";\n}\n',
           "#surya-callgraph":
-            'digraph G {\n  graph [ ratio = "auto", page = "100", compound =true ];\nsubgraph "clusterKlerosCore" {\n  graph [ label = "KlerosCore", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "KlerosCore.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "KlerosCore.initialize" [ label = "initialize", color = "blue" ];\n  "KlerosCore.reinitialize" [ label = "reinitialize", color = "blue" ];\n  "KlerosCore._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "KlerosCore._disableInitializers" [ label = "_disableInitializers" ];\n  "KlerosCore.__KlerosCoreBase_initialize" [ label = "__KlerosCoreBase_initialize" ];\n  "KlerosCore.courts" [ label = "courts" ];\n  "KlerosCore.getNumberOfRounds" [ label = "getNumberOfRounds" ];\n  "KlerosCore.sortitionModule" [ label = "sortitionModule" ];\n  "KlerosCore.disputes" [ label = "disputes" ];\n  "KlerosCore.appealPeriod" [ label = "appealPeriod" ];\n  "KlerosCore.isDisputeKitJumping" [ label = "isDisputeKitJumping" ];\n  "KlerosCore.getNumberOfVotes" [ label = "getNumberOfVotes" ];\n  "KlerosCore.paused" [ label = "paused" ];\n}\n\nsubgraph "clusterKlerosCoreBase" {\n  graph [ label = "KlerosCoreBase", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "KlerosCoreBase.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "KlerosCoreBase.onlyByGuardianOrGovernor" [ label = "onlyByGuardianOrGovernor", color = "yellow" ];\n  "KlerosCoreBase.whenPaused" [ label = "whenPaused", color = "yellow" ];\n  "KlerosCoreBase.whenNotPaused" [ label = "whenNotPaused", color = "yellow" ];\n  "KlerosCoreBase.__KlerosCoreBase_initialize" [ label = "__KlerosCoreBase_initialize", color = "white" ];\n  "KlerosCoreBase.pause" [ label = "pause", color = "blue" ];\n  "KlerosCoreBase.unpause" [ label = "unpause", color = "blue" ];\n  "KlerosCoreBase.executeGovernorProposal" [ label = "executeGovernorProposal", color = "blue" ];\n  "KlerosCoreBase.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "KlerosCoreBase.changeGuardian" [ label = "changeGuardian", color = "blue" ];\n  "KlerosCoreBase.changePinakion" [ label = "changePinakion", color = "blue" ];\n  "KlerosCoreBase.changeJurorProsecutionModule" [ label = "changeJurorProsecutionModule", color = "blue" ];\n  "KlerosCoreBase.changeSortitionModule" [ label = "changeSortitionModule", color = "blue" ];\n  "KlerosCoreBase.addNewDisputeKit" [ label = "addNewDisputeKit", color = "blue" ];\n  "KlerosCoreBase.createCourt" [ label = "createCourt", color = "blue" ];\n  "KlerosCoreBase.changeCourtParameters" [ label = "changeCourtParameters", color = "blue" ];\n  "KlerosCoreBase.enableDisputeKits" [ label = "enableDisputeKits", color = "blue" ];\n  "KlerosCoreBase.changeAcceptedFeeTokens" [ label = "changeAcceptedFeeTokens", color = "blue" ];\n  "KlerosCoreBase.changeCurrencyRates" [ label = "changeCurrencyRates", color = "blue" ];\n  "KlerosCoreBase.setStake" [ label = "setStake", color = "blue" ];\n  "KlerosCoreBase.setStakeBySortitionModule" [ label = "setStakeBySortitionModule", color = "blue" ];\n  "KlerosCoreBase.transferBySortitionModule" [ label = "transferBySortitionModule", color = "blue" ];\n  "KlerosCoreBase.createDispute" [ label = "createDispute", color = "blue" ];\n  "KlerosCoreBase._createDispute" [ label = "_createDispute" ];\n  "KlerosCoreBase.passPeriod" [ label = "passPeriod", color = "blue" ];\n  "KlerosCoreBase.draw" [ label = "draw", color = "blue" ];\n  "KlerosCoreBase.appeal" [ label = "appeal", color = "blue" ];\n  "KlerosCoreBase.execute" [ label = "execute", color = "blue" ];\n  "KlerosCoreBase._executePenalties" [ label = "_executePenalties" ];\n  "KlerosCoreBase._executeRewards" [ label = "_executeRewards" ];\n  "KlerosCoreBase.executeRuling" [ label = "executeRuling", color = "blue" ];\n  "KlerosCoreBase.arbitrationCost" [ label = "arbitrationCost" ];\n  "KlerosCoreBase.appealCost" [ label = "appealCost" ];\n  "KlerosCoreBase.appealPeriod" [ label = "appealPeriod", color = "blue" ];\n  "KlerosCoreBase.currentRuling" [ label = "currentRuling" ];\n  "KlerosCoreBase.getRoundInfo" [ label = "getRoundInfo", color = "blue" ];\n  "KlerosCoreBase.getPnkAtStakePerJuror" [ label = "getPnkAtStakePerJuror", color = "blue" ];\n  "KlerosCoreBase.getNumberOfRounds" [ label = "getNumberOfRounds", color = "blue" ];\n  "KlerosCoreBase.isSupported" [ label = "isSupported", color = "blue" ];\n  "KlerosCoreBase.getTimesPerPeriod" [ label = "getTimesPerPeriod", color = "blue" ];\n  "KlerosCoreBase.getNumberOfVotes" [ label = "getNumberOfVotes", color = "blue" ];\n  "KlerosCoreBase.isDisputeKitJumping" [ label = "isDisputeKitJumping", color = "blue" ];\n  "KlerosCoreBase.getDisputeKitsLength" [ label = "getDisputeKitsLength", color = "blue" ];\n  "KlerosCoreBase.convertEthToTokenAmount" [ label = "convertEthToTokenAmount" ];\n  "KlerosCoreBase._transferFeeToken" [ label = "_transferFeeToken" ];\n  "KlerosCoreBase._applyCoherence" [ label = "_applyCoherence" ];\n  "KlerosCoreBase._calculatePnkAtStake" [ label = "_calculatePnkAtStake" ];\n  "KlerosCoreBase._enableDisputeKit" [ label = "_enableDisputeKit" ];\n  "KlerosCoreBase._setStake" [ label = "_setStake" ];\n  "KlerosCoreBase._stakingFailed" [ label = "_stakingFailed" ];\n  "KlerosCoreBase._extraDataToCourtIDMinJurorsDisputeKit" [ label = "_extraDataToCourtIDMinJurorsDisputeKit" ];\n  "KlerosCoreBase.GovernorOnly" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.GuardianOrGovernorOnly" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.WhenPausedOnly" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.WhenNotPausedOnly" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.UnsuccessfulCall" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.MinStakeLowerThanParentCourt" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.UnsupportedDisputeKit" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.InvalidForkingCourtAsParent" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.WrongDisputeKitIndex" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.MustSupportDisputeKitClassic" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.CannotDisableClassicDK" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.address" [ label = "address" ];\n  "KlerosCoreBase.SortitionModuleOnly" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.ArbitrationFeesNotEnough" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.TokenNotAccepted" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.TransferFailed" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.DisputeKitNotSupportedByCourt" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.IERC20" [ label = "IERC20" ];\n  "KlerosCoreBase.EvidenceNotPassedAndNotAppeal" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.DisputeStillDrawing" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.CommitPeriodNotPassed" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.VotePeriodNotPassed" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.AppealPeriodNotPassed" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.DisputePeriodIsFinal" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.NotEvidencePeriod" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.AppealFeesNotEnough" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.DisputeNotAppealable" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.DisputeKitOnly" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.NotExecutionPeriod" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.payable" [ label = "payable" ];\n  "KlerosCoreBase.RulingAlreadyExecuted" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.StakingTransferFailed" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.UnstakingTransferFailed" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.StakingInTooManyCourts" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.StakingNotPossibleInThisCourt" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.StakingLessThanCourtMinStake" [ color = "brown2", shape =box ];\n  "KlerosCoreBase.StakingZeroWhenNoStake" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterKlerosCoreNeo" {\n  graph [ label = "KlerosCoreNeo", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "KlerosCoreNeo.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "KlerosCoreNeo.initialize" [ label = "initialize", color = "blue" ];\n  "KlerosCoreNeo.reinitialize" [ label = "reinitialize", color = "blue" ];\n  "KlerosCoreNeo._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "KlerosCoreNeo.changeJurorNft" [ label = "changeJurorNft", color = "blue" ];\n  "KlerosCoreNeo.changeArbitrableWhitelist" [ label = "changeArbitrableWhitelist", color = "blue" ];\n  "KlerosCoreBase.setStake" [ label = "setStake", color = "blue" ];\n  "KlerosCoreBase._createDispute" [ label = "_createDispute", color = "white" ];\n  "KlerosCoreBase._stakingFailed" [ label = "_stakingFailed", color = "white" ];\n  "KlerosCoreNeo._disableInitializers" [ label = "_disableInitializers" ];\n  "KlerosCoreNeo.NotEligibleForStaking" [ color = "brown2", shape =box ];\n  "KlerosCoreNeo.ArbitrableNotWhitelisted" [ color = "brown2", shape =box ];\n  "KlerosCoreNeo.StakingMoreThanMaxStakePerJuror" [ color = "brown2", shape =box ];\n  "KlerosCoreNeo.StakingMoreThanMaxTotalStaked" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterPolicyRegistry" {\n  graph [ label = "PolicyRegistry", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "PolicyRegistry.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "PolicyRegistry.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "PolicyRegistry.initialize" [ label = "initialize", color = "blue" ];\n  "PolicyRegistry.initialize2" [ label = "initialize2", color = "blue" ];\n  "PolicyRegistry._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "PolicyRegistry.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "PolicyRegistry.setPolicy" [ label = "setPolicy", color = "blue" ];\n  "PolicyRegistry._disableInitializers" [ label = "_disableInitializers" ];\n}\n\nsubgraph "clusterSortitionModule" {\n  graph [ label = "SortitionModule", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SortitionModule.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "SortitionModule.initialize" [ label = "initialize", color = "blue" ];\n  "SortitionModule.initialize4" [ label = "initialize4", color = "blue" ];\n  "SortitionModule._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "SortitionModule._disableInitializers" [ label = "_disableInitializers" ];\n  "SortitionModule.__SortitionModuleBase_initialize" [ label = "__SortitionModuleBase_initialize" ];\n}\n\nsubgraph "clusterSortitionModuleBase" {\n  graph [ label = "SortitionModuleBase", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SortitionModuleBase.__SortitionModuleBase_initialize" [ label = "__SortitionModuleBase_initialize", color = "white" ];\n  "SortitionModuleBase.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "SortitionModuleBase.onlyByCore" [ label = "onlyByCore", color = "yellow" ];\n  "SortitionModuleBase.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "SortitionModuleBase.changeMinStakingTime" [ label = "changeMinStakingTime", color = "blue" ];\n  "SortitionModuleBase.changeMaxDrawingTime" [ label = "changeMaxDrawingTime", color = "blue" ];\n  "SortitionModuleBase.changeRandomNumberGenerator" [ label = "changeRandomNumberGenerator", color = "blue" ];\n  "SortitionModuleBase.passPhase" [ label = "passPhase", color = "blue" ];\n  "ISortitionModule.createTree" [ label = "createTree", color = "blue" ];\n  "SortitionModuleBase.executeDelayedStakes" [ label = "executeDelayedStakes", color = "blue" ];\n  "ISortitionModule.createDisputeHook" [ label = "createDisputeHook", color = "blue" ];\n  "ISortitionModule.postDrawHook" [ label = "postDrawHook", color = "blue" ];\n  "SortitionModuleBase.notifyRandomNumber" [ label = "notifyRandomNumber", color = "green" ];\n  "ISortitionModule.validateStake" [ label = "validateStake", color = "blue" ];\n  "SortitionModuleBase._validateStake" [ label = "_validateStake" ];\n  "ISortitionModule.setStake" [ label = "setStake", color = "blue" ];\n  "SortitionModuleBase._setStake" [ label = "_setStake" ];\n  "ISortitionModule.lockStake" [ label = "lockStake", color = "blue" ];\n  "ISortitionModule.unlockStake" [ label = "unlockStake", color = "blue" ];\n  "ISortitionModule.penalizeStake" [ label = "penalizeStake", color = "blue" ];\n  "ISortitionModule.setJurorInactive" [ label = "setJurorInactive", color = "blue" ];\n  "SortitionModuleBase.withdrawLeftoverPNK" [ label = "withdrawLeftoverPNK", color = "blue" ];\n  "SortitionModuleBase.draw" [ label = "draw", color = "green" ];\n  "SortitionModuleBase.stakeOf" [ label = "stakeOf" ];\n  "SortitionModuleBase.getJurorBalance" [ label = "getJurorBalance", color = "blue" ];\n  "SortitionModuleBase.getJurorCourtIDs" [ label = "getJurorCourtIDs" ];\n  "SortitionModuleBase.isJurorStaked" [ label = "isJurorStaked", color = "blue" ];\n  "SortitionModuleBase.getJurorLeftoverPNK" [ label = "getJurorLeftoverPNK" ];\n  "SortitionModuleBase._updateParents" [ label = "_updateParents" ];\n  "SortitionModuleBase._stakePathIDToAccount" [ label = "_stakePathIDToAccount" ];\n  "SortitionModuleBase._extraDataToTreeK" [ label = "_extraDataToTreeK" ];\n  "SortitionModuleBase._set" [ label = "_set" ];\n  "SortitionModuleBase._accountAndCourtIDToStakePathID" [ label = "_accountAndCourtIDToStakePathID" ];\n  "SortitionModuleBase.address" [ label = "address" ];\n}\n\nsubgraph "clusterSortitionModuleNeo" {\n  graph [ label = "SortitionModuleNeo", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SortitionModuleNeo.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "SortitionModuleNeo.initialize" [ label = "initialize", color = "blue" ];\n  "SortitionModuleNeo.initialize4" [ label = "initialize4", color = "blue" ];\n  "SortitionModuleNeo._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "SortitionModuleNeo.changeMaxStakePerJuror" [ label = "changeMaxStakePerJuror", color = "blue" ];\n  "SortitionModuleNeo.changeMaxTotalStaked" [ label = "changeMaxTotalStaked", color = "blue" ];\n  "SortitionModuleBase._validateStake" [ label = "_validateStake", color = "white" ];\n  "SortitionModuleNeo._disableInitializers" [ label = "_disableInitializers" ];\n  "SortitionModuleNeo.__SortitionModuleBase_initialize" [ label = "__SortitionModuleBase_initialize" ];\n}\n\nsubgraph "clusterDisputeResolver" {\n  graph [ label = "DisputeResolver", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeResolver.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeResolver.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "DisputeResolver.changeArbitrator" [ label = "changeArbitrator", color = "blue" ];\n  "DisputeResolver.changeTemplateRegistry" [ label = "changeTemplateRegistry", color = "blue" ];\n  "DisputeResolver.createDisputeForTemplate" [ label = "createDisputeForTemplate", color = "blue" ];\n  "DisputeResolver.createDisputeForTemplateUri" [ label = "createDisputeForTemplateUri", color = "blue" ];\n  "DisputeResolver.rule" [ label = "rule", color = "blue" ];\n  "DisputeResolver._createDispute" [ label = "_createDispute" ];\n  "DisputeResolver.address" [ label = "address" ];\n}\n\nsubgraph "clusterDisputeTemplateRegistry" {\n  graph [ label = "DisputeTemplateRegistry", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeTemplateRegistry.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "DisputeTemplateRegistry.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeTemplateRegistry.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeTemplateRegistry.initialize2" [ label = "initialize2", color = "blue" ];\n  "DisputeTemplateRegistry._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeTemplateRegistry.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "IDisputeTemplateRegistry.setDisputeTemplate" [ label = "setDisputeTemplate", color = "blue" ];\n  "DisputeTemplateRegistry._disableInitializers" [ label = "_disableInitializers" ];\n}\n\nsubgraph "clusterDisputeKitClassic" {\n  graph [ label = "DisputeKitClassic", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitClassic.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitClassic.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitClassic.reinitialize" [ label = "reinitialize", color = "blue" ];\n  "DisputeKitClassic._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitClassic._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitClassic.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterDisputeKitClassicBase" {\n  graph [ label = "DisputeKitClassicBase", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitClassicBase.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "DisputeKitClassicBase.onlyByCore" [ label = "onlyByCore", color = "yellow" ];\n  "DisputeKitClassicBase.notJumped" [ label = "notJumped", color = "yellow" ];\n  "DisputeKitClassicBase.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize", color = "white" ];\n  "DisputeKitClassicBase.executeGovernorProposal" [ label = "executeGovernorProposal", color = "blue" ];\n  "DisputeKitClassicBase.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "DisputeKitClassicBase.changeCore" [ label = "changeCore", color = "blue" ];\n  "IDisputeKit.createDispute" [ label = "createDispute", color = "blue" ];\n  "IDisputeKit.draw" [ label = "draw", color = "blue" ];\n  "DisputeKitClassicBase.castCommit" [ label = "castCommit", color = "blue" ];\n  "DisputeKitClassicBase._castCommit" [ label = "_castCommit" ];\n  "DisputeKitClassicBase.castVote" [ label = "castVote", color = "blue" ];\n  "DisputeKitClassicBase._castVote" [ label = "_castVote" ];\n  "DisputeKitClassicBase.fundAppeal" [ label = "fundAppeal", color = "blue" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" [ label = "withdrawFeesAndRewards", color = "blue" ];\n  "DisputeKitClassicBase.hashVote" [ label = "hashVote" ];\n  "DisputeKitClassicBase.getFundedChoices" [ label = "getFundedChoices" ];\n  "IDisputeKit.currentRuling" [ label = "currentRuling", color = "blue" ];\n  "IDisputeKit.getDegreeOfCoherence" [ label = "getDegreeOfCoherence", color = "blue" ];\n  "IDisputeKit.getCoherentCount" [ label = "getCoherentCount", color = "blue" ];\n  "DisputeKitClassicBase.areCommitsAllCast" [ label = "areCommitsAllCast", color = "blue" ];\n  "DisputeKitClassicBase.areVotesAllCast" [ label = "areVotesAllCast", color = "blue" ];\n  "DisputeKitClassicBase.isAppealFunded" [ label = "isAppealFunded", color = "blue" ];\n  "IDisputeKit.isVoteActive" [ label = "isVoteActive", color = "blue" ];\n  "DisputeKitClassicBase.getRoundInfo" [ label = "getRoundInfo", color = "blue" ];\n  "DisputeKitClassicBase.getNumberOfRounds" [ label = "getNumberOfRounds", color = "blue" ];\n  "DisputeKitClassicBase.getLocalDisputeRoundID" [ label = "getLocalDisputeRoundID", color = "blue" ];\n  "DisputeKitClassicBase.getVoteInfo" [ label = "getVoteInfo", color = "blue" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck" ];\n  "DisputeKitClassicBase.address" [ label = "address" ];\n  "DisputeKitClassicBase.payable" [ label = "payable" ];\n}\n\nsubgraph "clusterIBalanceHolder" {\n  graph [ label = "IBalanceHolder  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IBalanceHolder.balanceOf" [ label = "balanceOf", color = "blue" ];\n}\n\nsubgraph "clusterIBalanceHolderERC1155" {\n  graph [ label = "IBalanceHolderERC1155  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IBalanceHolderERC1155.balanceOf" [ label = "balanceOf", color = "blue" ];\n}\n\nsubgraph "clusterDisputeKitGated" {\n  graph [ label = "DisputeKitGated", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitGated.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitGated.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitGated.reinitialize" [ label = "reinitialize", color = "blue" ];\n  "DisputeKitGated._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitGated.extraDataToTokenInfo" [ label = "extraDataToTokenInfo", color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck", color = "white" ];\n  "DisputeKitGated._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitGated.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterDisputeKitGatedShutter" {\n  graph [ label = "DisputeKitGatedShutter", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitGatedShutter.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitGatedShutter.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitGatedShutter.reinitialize" [ label = "reinitialize", color = "blue" ];\n  "DisputeKitGatedShutter._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitGatedShutter.castCommitShutter" [ label = "castCommitShutter", color = "blue" ];\n  "DisputeKitGatedShutter.castVoteShutter" [ label = "castVoteShutter", color = "blue" ];\n  "DisputeKitClassicBase.hashVote" [ label = "hashVote", color = "green" ];\n  "DisputeKitGatedShutter._extraDataToTokenInfo" [ label = "_extraDataToTokenInfo", color = "white" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck", color = "white" ];\n  "DisputeKitGatedShutter._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitGatedShutter.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterDisputeKitShutter" {\n  graph [ label = "DisputeKitShutter", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitShutter.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitShutter.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitShutter.reinitialize" [ label = "reinitialize", color = "blue" ];\n  "DisputeKitShutter._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitShutter.castCommitShutter" [ label = "castCommitShutter", color = "blue" ];\n  "DisputeKitShutter.castVoteShutter" [ label = "castVoteShutter", color = "blue" ];\n  "DisputeKitClassicBase.hashVote" [ label = "hashVote", color = "green" ];\n  "DisputeKitShutter._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitShutter.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterIProofOfHumanity" {\n  graph [ label = "IProofOfHumanity  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IProofOfHumanity.isRegistered" [ label = "isRegistered" ];\n}\n\nsubgraph "clusterDisputeKitSybilResistant" {\n  graph [ label = "DisputeKitSybilResistant", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitSybilResistant.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitSybilResistant.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitSybilResistant._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck", color = "white" ];\n  "DisputeKitSybilResistant._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitSybilResistant.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterEvidenceModule" {\n  graph [ label = "EvidenceModule", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "EvidenceModule.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "EvidenceModule.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "EvidenceModule.initialize" [ label = "initialize", color = "blue" ];\n  "EvidenceModule.initialize2" [ label = "initialize2", color = "blue" ];\n  "EvidenceModule._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "EvidenceModule.submitEvidence" [ label = "submitEvidence", color = "blue" ];\n  "EvidenceModule._disableInitializers" [ label = "_disableInitializers" ];\n}\n\nsubgraph "clusterIArbitrableV2" {\n  graph [ label = "IArbitrableV2  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IArbitrableV2.rule" [ label = "rule", color = "blue" ];\n}\n\nsubgraph "clusterIArbitratorV2" {\n  graph [ label = "IArbitratorV2  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IArbitratorV2.createDispute" [ label = "createDispute", color = "blue" ];\n  "IArbitratorV2.arbitrationCost" [ label = "arbitrationCost", color = "blue" ];\n  "IArbitratorV2.currentRuling" [ label = "currentRuling", color = "blue" ];\n}\n\nsubgraph "clusterIDisputeKit" {\n  graph [ label = "IDisputeKit  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IDisputeKit.createDispute" [ label = "createDispute", color = "blue" ];\n  "IDisputeKit.draw" [ label = "draw", color = "blue" ];\n  "IDisputeKit.getCoherentCount" [ label = "getCoherentCount", color = "blue" ];\n  "IDisputeKit.getDegreeOfCoherence" [ label = "getDegreeOfCoherence", color = "blue" ];\n  "IDisputeKit.isVoteActive" [ label = "isVoteActive", color = "blue" ];\n  "IDisputeKit.currentRuling" [ label = "currentRuling", color = "blue" ];\n  "IDisputeKit.areCommitsAllCast" [ label = "areCommitsAllCast", color = "blue" ];\n  "IDisputeKit.areVotesAllCast" [ label = "areVotesAllCast", color = "blue" ];\n  "IDisputeKit.isAppealFunded" [ label = "isAppealFunded", color = "blue" ];\n  "IDisputeKit.getRoundInfo" [ label = "getRoundInfo", color = "blue" ];\n  "IDisputeKit.getVoteInfo" [ label = "getVoteInfo", color = "blue" ];\n}\n\nsubgraph "clusterIDisputeTemplateRegistry" {\n  graph [ label = "IDisputeTemplateRegistry  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IDisputeTemplateRegistry.setDisputeTemplate" [ label = "setDisputeTemplate", color = "blue" ];\n}\n\nsubgraph "clusterIEvidence" {\n  graph [ label = "IEvidence  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n}\n\nsubgraph "clusterISortitionModule" {\n  graph [ label = "ISortitionModule  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "ISortitionModule.createTree" [ label = "createTree", color = "blue" ];\n  "ISortitionModule.createDisputeHook" [ label = "createDisputeHook", color = "blue" ];\n  "ISortitionModule.lockStake" [ label = "lockStake", color = "blue" ];\n  "ISortitionModule.postDrawHook" [ label = "postDrawHook", color = "blue" ];\n  "ISortitionModule.unlockStake" [ label = "unlockStake", color = "blue" ];\n  "ISortitionModule.penalizeStake" [ label = "penalizeStake", color = "blue" ];\n  "ISortitionModule.setJurorInactive" [ label = "setJurorInactive", color = "blue" ];\n  "ISortitionModule.validateStake" [ label = "validateStake", color = "blue" ];\n  "ISortitionModule.setStake" [ label = "setStake", color = "blue" ];\n  "ISortitionModule.draw" [ label = "draw", color = "blue" ];\n  "ISortitionModule.notifyRandomNumber" [ label = "notifyRandomNumber", color = "blue" ];\n  "ISortitionModule.getJurorBalance" [ label = "getJurorBalance", color = "blue" ];\n  "ISortitionModule.getJurorCourtIDs" [ label = "getJurorCourtIDs", color = "blue" ];\n  "ISortitionModule.isJurorStaked" [ label = "isJurorStaked", color = "blue" ];\n  "ISortitionModule.getJurorLeftoverPNK" [ label = "getJurorLeftoverPNK", color = "blue" ];\n  "ISortitionModule.withdrawLeftoverPNK" [ label = "withdrawLeftoverPNK", color = "blue" ];\n}\n\nsubgraph "clusterSafeERC20" {\n  graph [ label = "SafeERC20  (lib)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SafeERC20.increaseAllowance" [ label = "increaseAllowance", color = "white" ];\n  "SafeERC20.safeTransfer" [ label = "safeTransfer", color = "white" ];\n  "SafeERC20.safeTransferFrom" [ label = "safeTransferFrom", color = "white" ];\n  "SafeERC20.address" [ label = "address" ];\n}\n\nsubgraph "clusterWethLike" {\n  graph [ label = "WethLike  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "WethLike.deposit" [ label = "deposit", color = "blue" ];\n  "WethLike.transfer" [ label = "transfer", color = "blue" ];\n}\n\nsubgraph "clusterSafeSend" {\n  graph [ label = "SafeSend  (lib)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SafeSend.safeSend" [ label = "safeSend", color = "white" ];\n}\n\nsubgraph "clusterRNGWithFallback" {\n  graph [ label = "RNGWithFallback", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "RNGWithFallback.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "RNGWithFallback.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "RNGWithFallback.onlyByConsumer" [ label = "onlyByConsumer", color = "yellow" ];\n  "RNGWithFallback.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "RNGWithFallback.changeConsumer" [ label = "changeConsumer", color = "blue" ];\n  "RNGWithFallback.changeFallbackTimeout" [ label = "changeFallbackTimeout", color = "blue" ];\n  "IRNG.requestRandomness" [ label = "requestRandomness", color = "blue" ];\n  "IRNG.receiveRandomness" [ label = "receiveRandomness", color = "blue" ];\n  "RNGWithFallback.address" [ label = "address" ];\n  "RNGWithFallback.blockhash" [ label = "blockhash" ];\n}\n\nsubgraph "clusterChainlinkRNG" {\n  graph [ label = "ChainlinkRNG", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "ChainlinkRNG.onlyByGovernor" [ label = "onlyByGovernor", color = "yellow" ];\n  "ChainlinkRNG.onlyByConsumer" [ label = "onlyByConsumer", color = "yellow" ];\n  "ChainlinkRNG.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "ChainlinkRNG.changeGovernor" [ label = "changeGovernor", color = "blue" ];\n  "ChainlinkRNG.changeConsumer" [ label = "changeConsumer", color = "blue" ];\n  "ChainlinkRNG.changeVrfCoordinator" [ label = "changeVrfCoordinator", color = "blue" ];\n  "ChainlinkRNG.changeKeyHash" [ label = "changeKeyHash", color = "blue" ];\n  "ChainlinkRNG.changeSubscriptionId" [ label = "changeSubscriptionId", color = "blue" ];\n  "ChainlinkRNG.changeRequestConfirmations" [ label = "changeRequestConfirmations", color = "blue" ];\n  "ChainlinkRNG.changeCallbackGasLimit" [ label = "changeCallbackGasLimit", color = "blue" ];\n  "IRNG.requestRandomness" [ label = "requestRandomness", color = "blue" ];\n  "ChainlinkRNG.fulfillRandomWords" [ label = "fulfillRandomWords", color = "white" ];\n  "IRNG.receiveRandomness" [ label = "receiveRandomness", color = "blue" ];\n  "ChainlinkRNG.IVRFCoordinatorV2Plus" [ label = "IVRFCoordinatorV2Plus" ];\n  "ChainlinkRNG.CoordinatorSet" [ label = "CoordinatorSet" ];\n}\n\nsubgraph "clusterIRNG" {\n  graph [ label = "IRNG  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IRNG.requestRandomness" [ label = "requestRandomness", color = "blue" ];\n  "IRNG.receiveRandomness" [ label = "receiveRandomness", color = "blue" ];\n}\n\nsubgraph "clusterUUPSProxiable" {\n  graph [ label = "UUPSProxiable", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "UUPSProxiable._authorizeUpgrade" [ label = "_authorizeUpgrade" ];\n  "UUPSProxiable.upgradeToAndCall" [ label = "upgradeToAndCall", color = "green" ];\n  "UUPSProxiable.proxiableUUID" [ label = "proxiableUUID", color = "blue" ];\n  "UUPSProxiable.version" [ label = "version", color = "blue" ];\n  "UUPSProxiable._getImplementation" [ label = "_getImplementation" ];\n  "UUPSProxiable.address" [ label = "address" ];\n  "UUPSProxiable.UUPSUnauthorizedCallContext" [ color = "brown2", shape =box ];\n  "UUPSProxiable.UUPSUnsupportedProxiableUUID" [ color = "brown2", shape =box ];\n  "UUPSProxiable.FailedDelegateCall" [ color = "brown2", shape =box ];\n  "UUPSProxiable.InvalidImplementation" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterUUPSProxy" {\n  graph [ label = "UUPSProxy", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "UUPSProxy.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "UUPSProxy._delegate" [ label = "_delegate" ];\n  "UUPSProxy._getImplementation" [ label = "_getImplementation" ];\n  "UUPSProxy.<Fallback>" [ label = "<Fallback>", color = "blue" ];\n  "UUPSProxy.<Receive Ether>" [ label = "<Receive Ether>", color = "blue" ];\n}\n\nsubgraph "clusterInitializable" {\n  graph [ label = "Initializable", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "Initializable.initializer" [ label = "initializer", color = "yellow" ];\n  "Initializable.reinitializer" [ label = "reinitializer", color = "yellow" ];\n  "Initializable.onlyInitializing" [ label = "onlyInitializing", color = "yellow" ];\n  "Initializable._checkInitializing" [ label = "_checkInitializing" ];\n  "Initializable._disableInitializers" [ label = "_disableInitializers", color = "white" ];\n  "Initializable._getInitializedVersion" [ label = "_getInitializedVersion", color = "white" ];\n  "Initializable._isInitializing" [ label = "_isInitializing" ];\n  "Initializable._getInitializableStorage" [ label = "_getInitializableStorage" ];\n  "Initializable.address" [ label = "address" ];\n  "Initializable.AlreadyInitialized" [ color = "brown2", shape =box ];\n  "Initializable.NotInitializing" [ color = "brown2", shape =box ];\n  "Initializable.type" [ label = "type" ];\n}\n\nsubgraph "clusterIERC20" {\n  graph [ label = "IERC20", color = "lightgray" ];\n  "IERC20.safeTransfer" [ label = "safeTransfer" ];\n  "IERC20.safeTransferFrom" [ label = "safeTransferFrom" ];\n  "IERC20.approve" [ label = "approve" ];\n  "IERC20.allowance" [ label = "allowance" ];\n  "IERC20.UTION: When used with inheritance, manual care" [ label = "UTION: When used with inheritance, manual care" ];\n  "IERC20.utomatically lock it when it is deployed:\n *\n * ```\n * //" [ label = "utomatically lock it when it is deployed:\n *\n * ```\n * //" ];\n}\n\nsubgraph "cluster_recipient" {\n  graph [ label = "_recipient", color = "lightgray" ];\n  "_recipient.safeSend" [ label = "safeSend" ];\n}\n\nsubgraph "clusterIERC721" {\n  graph [ label = "IERC721", color = "lightgray" ];\n  "IERC721.balanceOf" [ label = "balanceOf" ];\n}\n\nsubgraph "cluster_beneficiary" {\n  graph [ label = "_beneficiary", color = "lightgray" ];\n  "_beneficiary.safeSend" [ label = "safeSend" ];\n}\n\nsubgraph "clusterabi" {\n  graph [ label = "abi", color = "lightgray" ];\n  "abi.encodeCall" [ label = "encodeCall" ];\n}\n\nsubgraph "cluster_to" {\n  graph [ label = "_to", color = "lightgray" ];\n  "_to.send" [ label = "send" ];\n}\n\nsubgraph "clusters_vrfCoordinator" {\n  graph [ label = "s_vrfCoordinator", color = "lightgray" ];\n  "s_vrfCoordinator.requestRandomWords" [ label = "requestRandomWords" ];\n}\n\nsubgraph "clusterVRFV2PlusClient" {\n  graph [ label = "VRFV2PlusClient", color = "lightgray" ];\n  "VRFV2PlusClient.RandomWordsRequest" [ label = "RandomWordsRequest" ];\n  "VRFV2PlusClient._argsToBytes" [ label = "_argsToBytes" ];\n  "VRFV2PlusClient.ExtraArgsV1" [ label = "ExtraArgsV1" ];\n}\n\nsubgraph "clusternewImplementation" {\n  graph [ label = "newImplementation", color = "lightgray" ];\n  "newImplementation.delegatecall" [ label = "delegatecall" ];\n}\n\nsubgraph "cluster_implementation" {\n  graph [ label = "_implementation", color = "lightgray" ];\n  "_implementation.delegatecall" [ label = "delegatecall" ];\n}\n\n  "KlerosCore.<Constructor>";\n  "KlerosCore._disableInitializers";\n  "KlerosCore.initialize";\n  "KlerosCore.__KlerosCoreBase_initialize";\n  "KlerosCoreBase.onlyByGovernor";\n  "KlerosCoreBase.GovernorOnly";\n  "KlerosCoreBase.onlyByGuardianOrGovernor";\n  "KlerosCoreBase.GuardianOrGovernorOnly";\n  "KlerosCoreBase.whenPaused";\n  "KlerosCoreBase.WhenPausedOnly";\n  "KlerosCoreBase.whenNotPaused";\n  "KlerosCoreBase.WhenNotPausedOnly";\n  "KlerosCoreBase.__KlerosCoreBase_initialize";\n  "ISortitionModule.createTree";\n  "KlerosCoreBase._enableDisputeKit";\n  "KlerosCoreBase.executeGovernorProposal";\n  "KlerosCoreBase.UnsuccessfulCall";\n  "KlerosCoreBase.createCourt";\n  "KlerosCoreBase.MinStakeLowerThanParentCourt";\n  "KlerosCoreBase.UnsupportedDisputeKit";\n  "KlerosCoreBase.InvalidForkingCourtAsParent";\n  "KlerosCoreBase.WrongDisputeKitIndex";\n  "KlerosCoreBase.MustSupportDisputeKitClassic";\n  "KlerosCoreBase.changeCourtParameters";\n  "KlerosCoreBase.enableDisputeKits";\n  "KlerosCoreBase.CannotDisableClassicDK";\n  "KlerosCoreBase.setStake";\n  "KlerosCoreBase._setStake";\n  "KlerosCoreBase.setStakeBySortitionModule";\n  "KlerosCoreBase.address";\n  "KlerosCoreBase.SortitionModuleOnly";\n  "KlerosCoreBase.transferBySortitionModule";\n  "IERC20.safeTransfer";\n  "KlerosCoreBase.createDispute";\n  "KlerosCoreBase.arbitrationCost";\n  "KlerosCoreBase.ArbitrationFeesNotEnough";\n  "KlerosCoreBase._createDispute";\n  "KlerosCoreBase.TokenNotAccepted";\n  "IERC20.safeTransferFrom";\n  "KlerosCoreBase.TransferFailed";\n  "KlerosCoreBase._extraDataToCourtIDMinJurorsDisputeKit";\n  "KlerosCoreBase.DisputeKitNotSupportedByCourt";\n  "KlerosCoreBase.convertEthToTokenAmount";\n  "KlerosCoreBase._calculatePnkAtStake";\n  "KlerosCoreBase.IERC20";\n  "ISortitionModule.createDisputeHook";\n  "IDisputeKit.createDispute";\n  "KlerosCoreBase.passPeriod";\n  "KlerosCoreBase.EvidenceNotPassedAndNotAppeal";\n  "KlerosCoreBase.DisputeStillDrawing";\n  "KlerosCoreBase.CommitPeriodNotPassed";\n  "KlerosCoreBase.VotePeriodNotPassed";\n  "KlerosCoreBase.AppealPeriodNotPassed";\n  "KlerosCoreBase.DisputePeriodIsFinal";\n  "KlerosCoreBase.draw";\n  "KlerosCoreBase.NotEvidencePeriod";\n  "IDisputeKit.draw";\n  "ISortitionModule.lockStake";\n  "ISortitionModule.postDrawHook";\n  "KlerosCoreBase.appeal";\n  "KlerosCoreBase.appealCost";\n  "KlerosCoreBase.AppealFeesNotEnough";\n  "KlerosCoreBase.DisputeNotAppealable";\n  "KlerosCoreBase.DisputeKitOnly";\n  "KlerosCoreBase.execute";\n  "KlerosCoreBase.NotExecutionPeriod";\n  "IDisputeKit.getCoherentCount";\n  "KlerosCoreBase._executePenalties";\n  "KlerosCoreBase._executeRewards";\n  "IDisputeKit.getDegreeOfCoherence";\n  "ISortitionModule.unlockStake";\n  "ISortitionModule.penalizeStake";\n  "IDisputeKit.isVoteActive";\n  "ISortitionModule.setJurorInactive";\n  "KlerosCoreBase._transferFeeToken";\n  "KlerosCoreBase.payable";\n  "KlerosCoreBase._applyCoherence";\n  "KlerosCoreBase.executeRuling";\n  "KlerosCoreBase.RulingAlreadyExecuted";\n  "KlerosCoreBase.currentRuling";\n  "IDisputeKit.currentRuling";\n  "_recipient.safeSend";\n  "KlerosCoreBase._stakingFailed";\n  "ISortitionModule.validateStake";\n  "ISortitionModule.setStake";\n  "KlerosCoreBase.StakingTransferFailed";\n  "KlerosCoreBase.UnstakingTransferFailed";\n  "KlerosCoreBase.StakingInTooManyCourts";\n  "KlerosCoreBase.StakingNotPossibleInThisCourt";\n  "KlerosCoreBase.StakingLessThanCourtMinStake";\n  "KlerosCoreBase.StakingZeroWhenNoStake";\n  "KlerosCoreNeo.<Constructor>";\n  "KlerosCoreNeo._disableInitializers";\n  "KlerosCoreNeo.initialize";\n  "IERC721.balanceOf";\n  "KlerosCoreNeo.NotEligibleForStaking";\n  "KlerosCoreNeo.ArbitrableNotWhitelisted";\n  "KlerosCoreNeo.StakingMoreThanMaxStakePerJuror";\n  "KlerosCoreNeo.StakingMoreThanMaxTotalStaked";\n  "PolicyRegistry.<Constructor>";\n  "PolicyRegistry._disableInitializers";\n  "SortitionModule.<Constructor>";\n  "SortitionModule._disableInitializers";\n  "SortitionModule.initialize";\n  "SortitionModule.__SortitionModuleBase_initialize";\n  "SortitionModuleBase.onlyByGovernor";\n  "SortitionModuleBase.address";\n  "SortitionModuleBase.onlyByCore";\n  "SortitionModuleBase.changeRandomNumberGenerator";\n  "IRNG.requestRandomness";\n  "SortitionModuleBase.passPhase";\n  "IRNG.receiveRandomness";\n  "SortitionModuleBase._extraDataToTreeK";\n  "SortitionModuleBase.executeDelayedStakes";\n  "SortitionModuleBase._validateStake";\n  "SortitionModuleBase.stakeOf";\n  "SortitionModuleBase._setStake";\n  "SortitionModuleBase._accountAndCourtIDToStakePathID";\n  "SortitionModuleBase._set";\n  "KlerosCore.courts";\n  "SortitionModuleBase.getJurorLeftoverPNK";\n  "SortitionModuleBase.getJurorCourtIDs";\n  "SortitionModuleBase.withdrawLeftoverPNK";\n  "SortitionModuleBase.draw";\n  "SortitionModuleBase._stakePathIDToAccount";\n  "SortitionModuleBase.getJurorBalance";\n  "SortitionModuleBase._updateParents";\n  "SortitionModuleNeo.<Constructor>";\n  "SortitionModuleNeo._disableInitializers";\n  "SortitionModuleNeo.initialize";\n  "SortitionModuleNeo.__SortitionModuleBase_initialize";\n  "DisputeResolver.createDisputeForTemplate";\n  "DisputeResolver._createDispute";\n  "DisputeResolver.createDisputeForTemplateUri";\n  "DisputeResolver.rule";\n  "DisputeResolver.address";\n  "IDisputeTemplateRegistry.setDisputeTemplate";\n  "DisputeTemplateRegistry.<Constructor>";\n  "DisputeTemplateRegistry._disableInitializers";\n  "DisputeKitClassic.<Constructor>";\n  "DisputeKitClassic._disableInitializers";\n  "DisputeKitClassic.initialize";\n  "DisputeKitClassic.__DisputeKitClassicBase_initialize";\n  "DisputeKitClassicBase.onlyByCore";\n  "DisputeKitClassicBase.address";\n  "KlerosCore.getNumberOfRounds";\n  "KlerosCore.sortitionModule";\n  "KlerosCore.disputes";\n  "ISortitionModule.draw";\n  "DisputeKitClassicBase._postDrawCheck";\n  "DisputeKitClassicBase.castCommit";\n  "DisputeKitClassicBase._castCommit";\n  "DisputeKitClassicBase.castVote";\n  "DisputeKitClassicBase._castVote";\n  "DisputeKitClassicBase.hashVote";\n  "DisputeKitClassicBase.fundAppeal";\n  "KlerosCore.appealPeriod";\n  "KlerosCore.isDisputeKitJumping";\n  "KlerosCore.getNumberOfVotes";\n  "DisputeKitClassicBase.payable";\n  "DisputeKitClassicBase.withdrawFeesAndRewards";\n  "KlerosCore.paused";\n  "_beneficiary.safeSend";\n  "DisputeKitClassicBase.getFundedChoices";\n  "DisputeKitClassicBase.areVotesAllCast";\n  "DisputeKitClassicBase.isAppealFunded";\n  "DisputeKitGated.<Constructor>";\n  "DisputeKitGated._disableInitializers";\n  "DisputeKitGated.initialize";\n  "DisputeKitGated.__DisputeKitClassicBase_initialize";\n  "DisputeKitGated.extraDataToTokenInfo";\n  "DisputeKitGatedShutter.<Constructor>";\n  "DisputeKitGatedShutter._disableInitializers";\n  "DisputeKitGatedShutter.initialize";\n  "DisputeKitGatedShutter.__DisputeKitClassicBase_initialize";\n  "DisputeKitGatedShutter.castCommitShutter";\n  "DisputeKitGatedShutter.castVoteShutter";\n  "DisputeKitGatedShutter._extraDataToTokenInfo";\n  "DisputeKitShutter.<Constructor>";\n  "DisputeKitShutter._disableInitializers";\n  "DisputeKitShutter.initialize";\n  "DisputeKitShutter.__DisputeKitClassicBase_initialize";\n  "DisputeKitShutter.castCommitShutter";\n  "DisputeKitShutter.castVoteShutter";\n  "DisputeKitSybilResistant.<Constructor>";\n  "DisputeKitSybilResistant._disableInitializers";\n  "DisputeKitSybilResistant.initialize";\n  "DisputeKitSybilResistant.__DisputeKitClassicBase_initialize";\n  "IProofOfHumanity.isRegistered";\n  "EvidenceModule.<Constructor>";\n  "EvidenceModule._disableInitializers";\n  "SafeERC20.increaseAllowance";\n  "IERC20.approve";\n  "IERC20.allowance";\n  "SafeERC20.address";\n  "SafeERC20.safeTransfer";\n  "IERC20.UTION: When used with inheritance, manual care";\n  "abi.encodeCall";\n  "SafeERC20.safeTransferFrom";\n  "IERC20.utomatically lock it when it is deployed:\n *\n * ```\n * //";\n  "SafeSend.safeSend";\n  "_to.send";\n  "RNGWithFallback.<Constructor>";\n  "RNGWithFallback.address";\n  "RNGWithFallback.blockhash";\n  "ChainlinkRNG.changeVrfCoordinator";\n  "ChainlinkRNG.IVRFCoordinatorV2Plus";\n  "ChainlinkRNG.CoordinatorSet";\n  "s_vrfCoordinator.requestRandomWords";\n  "VRFV2PlusClient.RandomWordsRequest";\n  "VRFV2PlusClient._argsToBytes";\n  "VRFV2PlusClient.ExtraArgsV1";\n  "UUPSProxiable.upgradeToAndCall";\n  "UUPSProxiable._authorizeUpgrade";\n  "UUPSProxiable.address";\n  "UUPSProxiable._getImplementation";\n  "UUPSProxiable.UUPSUnauthorizedCallContext";\n  "UUPSProxiable.UUPSUnsupportedProxiableUUID";\n  "newImplementation.delegatecall";\n  "UUPSProxiable.FailedDelegateCall";\n  "UUPSProxiable.InvalidImplementation";\n  "UUPSProxiable.proxiableUUID";\n  "UUPSProxy.<Constructor>";\n  "_implementation.delegatecall";\n  "UUPSProxy.<Fallback>";\n  "UUPSProxy._delegate";\n  "UUPSProxy._getImplementation";\n  "UUPSProxy.<Receive Ether>";\n  "Initializable.initializer";\n  "Initializable._getInitializableStorage";\n  "Initializable.address";\n  "Initializable.AlreadyInitialized";\n  "Initializable.reinitializer";\n  "Initializable.onlyInitializing";\n  "Initializable._checkInitializing";\n  "Initializable._isInitializing";\n  "Initializable.NotInitializing";\n  "Initializable._disableInitializers";\n  "Initializable.type";\n  "Initializable._getInitializedVersion";\n  "KlerosCore.<Constructor>" -> "KlerosCore._disableInitializers" [ color = "green" ];\n  "KlerosCore.initialize" -> "KlerosCore.__KlerosCoreBase_initialize" [ color = "green" ];\n  "KlerosCoreBase.onlyByGovernor" -> "KlerosCoreBase.GovernorOnly" [ color = "red" ];\n  "KlerosCoreBase.onlyByGuardianOrGovernor" -> "KlerosCoreBase.GuardianOrGovernorOnly" [ color = "red" ];\n  "KlerosCoreBase.whenPaused" -> "KlerosCoreBase.WhenPausedOnly" [ color = "red" ];\n  "KlerosCoreBase.whenNotPaused" -> "KlerosCoreBase.WhenNotPausedOnly" [ color = "red" ];\n  "KlerosCoreBase.__KlerosCoreBase_initialize" -> "ISortitionModule.createTree" [ color = "orange" ];\n  "KlerosCoreBase.__KlerosCoreBase_initialize" -> "ISortitionModule.createTree" [ color = "orange" ];\n  "KlerosCoreBase.__KlerosCoreBase_initialize" -> "KlerosCoreBase._enableDisputeKit" [ color = "green" ];\n  "KlerosCoreBase.executeGovernorProposal" -> "KlerosCoreBase.UnsuccessfulCall" [ color = "red" ];\n  "KlerosCoreBase.createCourt" -> "KlerosCoreBase.MinStakeLowerThanParentCourt" [ color = "red" ];\n  "KlerosCoreBase.createCourt" -> "KlerosCoreBase.UnsupportedDisputeKit" [ color = "red" ];\n  "KlerosCoreBase.createCourt" -> "KlerosCoreBase.InvalidForkingCourtAsParent" [ color = "red" ];\n  "KlerosCoreBase.createCourt" -> "KlerosCoreBase.WrongDisputeKitIndex" [ color = "red" ];\n  "KlerosCoreBase.createCourt" -> "KlerosCoreBase._enableDisputeKit" [ color = "green" ];\n  "KlerosCoreBase.createCourt" -> "KlerosCoreBase.MustSupportDisputeKitClassic" [ color = "red" ];\n  "KlerosCoreBase.createCourt" -> "ISortitionModule.createTree" [ color = "orange" ];\n  "KlerosCoreBase.changeCourtParameters" -> "KlerosCoreBase.MinStakeLowerThanParentCourt" [ color = "red" ];\n  "KlerosCoreBase.changeCourtParameters" -> "KlerosCoreBase.MinStakeLowerThanParentCourt" [ color = "red" ];\n  "KlerosCoreBase.enableDisputeKits" -> "KlerosCoreBase.WrongDisputeKitIndex" [ color = "red" ];\n  "KlerosCoreBase.enableDisputeKits" -> "KlerosCoreBase._enableDisputeKit" [ color = "green" ];\n  "KlerosCoreBase.enableDisputeKits" -> "KlerosCoreBase.CannotDisableClassicDK" [ color = "red" ];\n  "KlerosCoreBase.enableDisputeKits" -> "KlerosCoreBase._enableDisputeKit" [ color = "green" ];\n  "KlerosCoreBase.setStake" -> "KlerosCoreBase._setStake" [ color = "green" ];\n  "KlerosCoreBase.setStakeBySortitionModule" -> "KlerosCoreBase.address" [ color = "green" ];\n  "KlerosCoreBase.setStakeBySortitionModule" -> "KlerosCoreBase.SortitionModuleOnly" [ color = "red" ];\n  "KlerosCoreBase.setStakeBySortitionModule" -> "KlerosCoreBase._setStake" [ color = "green" ];\n  "KlerosCoreBase.transferBySortitionModule" -> "KlerosCoreBase.address" [ color = "green" ];\n  "KlerosCoreBase.transferBySortitionModule" -> "KlerosCoreBase.SortitionModuleOnly" [ color = "red" ];\n  "KlerosCoreBase.transferBySortitionModule" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.arbitrationCost" [ color = "green" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.ArbitrationFeesNotEnough" [ color = "red" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase._createDispute" [ color = "green" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.TokenNotAccepted" [ color = "red" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.arbitrationCost" [ color = "green" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.ArbitrationFeesNotEnough" [ color = "red" ];\n  "KlerosCoreBase.createDispute" -> "IERC20.safeTransferFrom" [ color = "orange" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.address" [ color = "green" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase.TransferFailed" [ color = "red" ];\n  "KlerosCoreBase.createDispute" -> "KlerosCoreBase._createDispute" [ color = "green" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreBase._extraDataToCourtIDMinJurorsDisputeKit" [ color = "green" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreBase.DisputeKitNotSupportedByCourt" [ color = "red" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreBase.convertEthToTokenAmount" [ color = "green" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreBase._calculatePnkAtStake" [ color = "green" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreBase.IERC20" [ color = "green" ];\n  "KlerosCoreBase._createDispute" -> "ISortitionModule.createDisputeHook" [ color = "orange" ];\n  "KlerosCoreBase._createDispute" -> "IDisputeKit.createDispute" [ color = "orange" ];\n  "KlerosCoreBase.passPeriod" -> "KlerosCoreBase.EvidenceNotPassedAndNotAppeal" [ color = "red" ];\n  "KlerosCoreBase.passPeriod" -> "KlerosCoreBase.DisputeStillDrawing" [ color = "red" ];\n  "KlerosCoreBase.passPeriod" -> "KlerosCoreBase.CommitPeriodNotPassed" [ color = "red" ];\n  "KlerosCoreBase.passPeriod" -> "KlerosCoreBase.VotePeriodNotPassed" [ color = "red" ];\n  "KlerosCoreBase.passPeriod" -> "KlerosCoreBase.AppealPeriodNotPassed" [ color = "red" ];\n  "KlerosCoreBase.passPeriod" -> "KlerosCoreBase.DisputePeriodIsFinal" [ color = "red" ];\n  "KlerosCoreBase.draw" -> "KlerosCoreBase.NotEvidencePeriod" [ color = "red" ];\n  "KlerosCoreBase.draw" -> "IDisputeKit.draw" [ color = "orange" ];\n  "KlerosCoreBase.draw" -> "KlerosCoreBase.address" [ color = "green" ];\n  "KlerosCoreBase.draw" -> "ISortitionModule.lockStake" [ color = "orange" ];\n  "KlerosCoreBase.draw" -> "ISortitionModule.postDrawHook" [ color = "orange" ];\n  "KlerosCoreBase.appeal" -> "KlerosCoreBase.appealCost" [ color = "green" ];\n  "KlerosCoreBase.appeal" -> "KlerosCoreBase.AppealFeesNotEnough" [ color = "red" ];\n  "KlerosCoreBase.appeal" -> "KlerosCoreBase.DisputeNotAppealable" [ color = "red" ];\n  "KlerosCoreBase.appeal" -> "KlerosCoreBase.address" [ color = "green" ];\n  "KlerosCoreBase.appeal" -> "KlerosCoreBase.DisputeKitOnly" [ color = "red" ];\n  "KlerosCoreBase.appeal" -> "KlerosCoreBase._calculatePnkAtStake" [ color = "green" ];\n  "KlerosCoreBase.appeal" -> "ISortitionModule.createDisputeHook" [ color = "orange" ];\n  "KlerosCoreBase.execute" -> "KlerosCoreBase.NotExecutionPeriod" [ color = "red" ];\n  "KlerosCoreBase.execute" -> "IDisputeKit.getCoherentCount" [ color = "orange" ];\n  "KlerosCoreBase.execute" -> "KlerosCoreBase._executePenalties" [ color = "green" ];\n  "KlerosCoreBase.execute" -> "KlerosCoreBase._executeRewards" [ color = "green" ];\n  "KlerosCoreBase._executePenalties" -> "IDisputeKit.getDegreeOfCoherence" [ color = "orange" ];\n  "KlerosCoreBase._executePenalties" -> "ISortitionModule.unlockStake" [ color = "orange" ];\n  "KlerosCoreBase._executePenalties" -> "ISortitionModule.penalizeStake" [ color = "orange" ];\n  "KlerosCoreBase._executePenalties" -> "IDisputeKit.isVoteActive" [ color = "orange" ];\n  "KlerosCoreBase._executePenalties" -> "ISortitionModule.setJurorInactive" [ color = "orange" ];\n  "KlerosCoreBase._executePenalties" -> "KlerosCoreBase._transferFeeToken" [ color = "green" ];\n  "KlerosCoreBase._executePenalties" -> "KlerosCoreBase.payable" [ color = "green" ];\n  "KlerosCoreBase._executePenalties" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCoreBase._executeRewards" -> "IDisputeKit.getDegreeOfCoherence" [ color = "orange" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase._applyCoherence" [ color = "green" ];\n  "KlerosCoreBase._executeRewards" -> "ISortitionModule.unlockStake" [ color = "orange" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase._applyCoherence" [ color = "green" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase._applyCoherence" [ color = "green" ];\n  "KlerosCoreBase._executeRewards" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase._transferFeeToken" [ color = "green" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase.payable" [ color = "green" ];\n  "KlerosCoreBase._executeRewards" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase._transferFeeToken" [ color = "green" ];\n  "KlerosCoreBase._executeRewards" -> "KlerosCoreBase.payable" [ color = "green" ];\n  "KlerosCoreBase.executeRuling" -> "KlerosCoreBase.NotExecutionPeriod" [ color = "red" ];\n  "KlerosCoreBase.executeRuling" -> "KlerosCoreBase.RulingAlreadyExecuted" [ color = "red" ];\n  "KlerosCoreBase.executeRuling" -> "KlerosCoreBase.currentRuling" [ color = "green" ];\n  "KlerosCoreBase.arbitrationCost" -> "KlerosCoreBase._extraDataToCourtIDMinJurorsDisputeKit" [ color = "green" ];\n  "KlerosCoreBase.arbitrationCost" -> "KlerosCoreBase.convertEthToTokenAmount" [ color = "green" ];\n  "KlerosCoreBase.arbitrationCost" -> "KlerosCoreBase.arbitrationCost" [ color = "green" ];\n  "KlerosCoreBase.currentRuling" -> "IDisputeKit.currentRuling" [ color = "orange" ];\n  "KlerosCoreBase._transferFeeToken" -> "_recipient.safeSend" [ color = "orange" ];\n  "KlerosCoreBase._transferFeeToken" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCoreBase._setStake" -> "KlerosCoreBase._stakingFailed" [ color = "green" ];\n  "KlerosCoreBase._setStake" -> "KlerosCoreBase._stakingFailed" [ color = "green" ];\n  "KlerosCoreBase._setStake" -> "ISortitionModule.validateStake" [ color = "orange" ];\n  "KlerosCoreBase._setStake" -> "KlerosCoreBase._stakingFailed" [ color = "green" ];\n  "KlerosCoreBase._setStake" -> "IERC20.safeTransferFrom" [ color = "orange" ];\n  "KlerosCoreBase._setStake" -> "KlerosCoreBase.address" [ color = "green" ];\n  "KlerosCoreBase._setStake" -> "KlerosCoreBase._stakingFailed" [ color = "green" ];\n  "KlerosCoreBase._setStake" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCoreBase._setStake" -> "KlerosCoreBase._stakingFailed" [ color = "green" ];\n  "KlerosCoreBase._setStake" -> "ISortitionModule.setStake" [ color = "orange" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase.StakingTransferFailed" [ color = "red" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase.UnstakingTransferFailed" [ color = "red" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase.StakingInTooManyCourts" [ color = "red" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase.StakingNotPossibleInThisCourt" [ color = "red" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase.StakingLessThanCourtMinStake" [ color = "red" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase.StakingZeroWhenNoStake" [ color = "red" ];\n  "KlerosCoreNeo.<Constructor>" -> "KlerosCoreNeo._disableInitializers" [ color = "green" ];\n  "KlerosCoreNeo.initialize" -> "KlerosCoreBase.__KlerosCoreBase_initialize" [ color = "green" ];\n  "KlerosCoreBase.setStake" -> "IERC721.balanceOf" [ color = "orange" ];\n  "KlerosCoreBase.setStake" -> "KlerosCoreNeo.NotEligibleForStaking" [ color = "red" ];\n  "KlerosCoreBase.setStake" -> "KlerosCoreBase._setStake" [ color = "orange" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreNeo.ArbitrableNotWhitelisted" [ color = "red" ];\n  "KlerosCoreBase._createDispute" -> "KlerosCoreBase._createDispute" [ color = "orange" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreBase._stakingFailed" [ color = "orange" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreNeo.StakingMoreThanMaxStakePerJuror" [ color = "red" ];\n  "KlerosCoreBase._stakingFailed" -> "KlerosCoreNeo.StakingMoreThanMaxTotalStaked" [ color = "red" ];\n  "PolicyRegistry.<Constructor>" -> "PolicyRegistry._disableInitializers" [ color = "green" ];\n  "SortitionModule.<Constructor>" -> "SortitionModule._disableInitializers" [ color = "green" ];\n  "SortitionModule.initialize" -> "SortitionModule.__SortitionModuleBase_initialize" [ color = "green" ];\n  "SortitionModuleBase.onlyByGovernor" -> "SortitionModuleBase.address" [ color = "green" ];\n  "SortitionModuleBase.onlyByCore" -> "SortitionModuleBase.address" [ color = "green" ];\n  "SortitionModuleBase.changeRandomNumberGenerator" -> "IRNG.requestRandomness" [ color = "orange" ];\n  "SortitionModuleBase.passPhase" -> "IRNG.requestRandomness" [ color = "orange" ];\n  "SortitionModuleBase.passPhase" -> "IRNG.receiveRandomness" [ color = "orange" ];\n  "ISortitionModule.createTree" -> "SortitionModuleBase._extraDataToTreeK" [ color = "green" ];\n  "SortitionModuleBase.executeDelayedStakes" -> "KlerosCoreBase.setStakeBySortitionModule" [ color = "orange" ];\n  "ISortitionModule.validateStake" -> "SortitionModuleBase._validateStake" [ color = "green" ];\n  "SortitionModuleBase._validateStake" -> "SortitionModuleBase.stakeOf" [ color = "green" ];\n  "ISortitionModule.setStake" -> "SortitionModuleBase._setStake" [ color = "green" ];\n  "SortitionModuleBase._setStake" -> "SortitionModuleBase.stakeOf" [ color = "green" ];\n  "SortitionModuleBase._setStake" -> "SortitionModuleBase._accountAndCourtIDToStakePathID" [ color = "green" ];\n  "SortitionModuleBase._setStake" -> "SortitionModuleBase._set" [ color = "green" ];\n  "SortitionModuleBase._setStake" -> "KlerosCore.courts" [ color = "orange" ];\n  "ISortitionModule.unlockStake" -> "SortitionModuleBase.getJurorLeftoverPNK" [ color = "green" ];\n  "ISortitionModule.setJurorInactive" -> "SortitionModuleBase.getJurorCourtIDs" [ color = "green" ];\n  "ISortitionModule.setJurorInactive" -> "KlerosCoreBase.setStakeBySortitionModule" [ color = "orange" ];\n  "SortitionModuleBase.withdrawLeftoverPNK" -> "SortitionModuleBase.getJurorLeftoverPNK" [ color = "green" ];\n  "SortitionModuleBase.withdrawLeftoverPNK" -> "KlerosCoreBase.transferBySortitionModule" [ color = "orange" ];\n  "SortitionModuleBase.draw" -> "SortitionModuleBase.address" [ color = "green" ];\n  "SortitionModuleBase.draw" -> "SortitionModuleBase._stakePathIDToAccount" [ color = "green" ];\n  "SortitionModuleBase.stakeOf" -> "SortitionModuleBase._accountAndCourtIDToStakePathID" [ color = "green" ];\n  "SortitionModuleBase.stakeOf" -> "SortitionModuleBase.stakeOf" [ color = "green" ];\n  "SortitionModuleBase.getJurorBalance" -> "SortitionModuleBase.stakeOf" [ color = "green" ];\n  "SortitionModuleBase._set" -> "SortitionModuleBase._updateParents" [ color = "green" ];\n  "SortitionModuleBase._set" -> "SortitionModuleBase._updateParents" [ color = "green" ];\n  "SortitionModuleBase._set" -> "SortitionModuleBase._updateParents" [ color = "green" ];\n  "SortitionModuleNeo.<Constructor>" -> "SortitionModuleNeo._disableInitializers" [ color = "green" ];\n  "SortitionModuleNeo.initialize" -> "SortitionModuleNeo.__SortitionModuleBase_initialize" [ color = "green" ];\n  "SortitionModuleBase._validateStake" -> "SortitionModuleBase.stakeOf" [ color = "green" ];\n  "SortitionModuleBase._validateStake" -> "SortitionModuleBase._validateStake" [ color = "orange" ];\n  "DisputeResolver.createDisputeForTemplate" -> "DisputeResolver._createDispute" [ color = "green" ];\n  "DisputeResolver.createDisputeForTemplateUri" -> "DisputeResolver._createDispute" [ color = "green" ];\n  "DisputeResolver.rule" -> "DisputeResolver.address" [ color = "green" ];\n  "DisputeResolver._createDispute" -> "IDisputeTemplateRegistry.setDisputeTemplate" [ color = "orange" ];\n  "DisputeTemplateRegistry.<Constructor>" -> "DisputeTemplateRegistry._disableInitializers" [ color = "green" ];\n  "DisputeKitClassic.<Constructor>" -> "DisputeKitClassic._disableInitializers" [ color = "green" ];\n  "DisputeKitClassic.initialize" -> "DisputeKitClassic.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitClassicBase.onlyByCore" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "IDisputeKit.createDispute" -> "KlerosCore.getNumberOfRounds" [ color = "orange" ];\n  "IDisputeKit.draw" -> "KlerosCore.sortitionModule" [ color = "orange" ];\n  "IDisputeKit.draw" -> "KlerosCore.disputes" [ color = "orange" ];\n  "IDisputeKit.draw" -> "ISortitionModule.draw" [ color = "orange" ];\n  "IDisputeKit.draw" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "IDisputeKit.draw" -> "DisputeKitClassicBase._postDrawCheck" [ color = "green" ];\n  "IDisputeKit.draw" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase.castCommit" -> "DisputeKitClassicBase._castCommit" [ color = "green" ];\n  "DisputeKitClassicBase._castCommit" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase.castVote" -> "DisputeKitClassicBase._castVote" [ color = "green" ];\n  "DisputeKitClassicBase._castVote" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase._castVote" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase._castVote" -> "KlerosCore.courts" [ color = "orange" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.hashVote" [ color = "green" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.appealPeriod" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "IDisputeKit.currentRuling" [ color = "green" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.getNumberOfRounds" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCoreBase.appealCost" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.isDisputeKitJumping" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.getNumberOfVotes" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.payable" [ color = "green" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "KlerosCore.paused" [ color = "orange" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "KlerosCoreBase.currentRuling" [ color = "orange" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "_beneficiary.safeSend" [ color = "orange" ];\n  "IDisputeKit.currentRuling" -> "KlerosCore.disputes" [ color = "orange" ];\n  "IDisputeKit.currentRuling" -> "DisputeKitClassicBase.getFundedChoices" [ color = "green" ];\n  "IDisputeKit.getDegreeOfCoherence" -> "KlerosCoreBase.currentRuling" [ color = "orange" ];\n  "IDisputeKit.getCoherentCount" -> "KlerosCoreBase.currentRuling" [ color = "orange" ];\n  "DisputeKitClassicBase.areVotesAllCast" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase.areVotesAllCast" -> "KlerosCore.courts" [ color = "orange" ];\n  "DisputeKitClassicBase.isAppealFunded" -> "KlerosCore.appealPeriod" [ color = "orange" ];\n  "DisputeKitClassicBase.isAppealFunded" -> "DisputeKitClassicBase.getFundedChoices" [ color = "green" ];\n  "DisputeKitGated.<Constructor>" -> "DisputeKitGated._disableInitializers" [ color = "green" ];\n  "DisputeKitGated.initialize" -> "DisputeKitGated.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitGated.extraDataToTokenInfo" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase._postDrawCheck" [ color = "orange" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitGated.extraDataToTokenInfo" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitGatedShutter.<Constructor>" -> "DisputeKitGatedShutter._disableInitializers" [ color = "green" ];\n  "DisputeKitGatedShutter.initialize" -> "DisputeKitGatedShutter.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitGatedShutter.castCommitShutter" -> "DisputeKitClassicBase._castCommit" [ color = "green" ];\n  "DisputeKitGatedShutter.castVoteShutter" -> "DisputeKitClassicBase._castVote" [ color = "green" ];\n  "DisputeKitGatedShutter._extraDataToTokenInfo" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase._postDrawCheck" [ color = "orange" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitGatedShutter._extraDataToTokenInfo" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitShutter.<Constructor>" -> "DisputeKitShutter._disableInitializers" [ color = "green" ];\n  "DisputeKitShutter.initialize" -> "DisputeKitShutter.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitShutter.castCommitShutter" -> "DisputeKitClassicBase._castCommit" [ color = "green" ];\n  "DisputeKitShutter.castVoteShutter" -> "DisputeKitClassicBase._castVote" [ color = "green" ];\n  "DisputeKitSybilResistant.<Constructor>" -> "DisputeKitSybilResistant._disableInitializers" [ color = "green" ];\n  "DisputeKitSybilResistant.initialize" -> "DisputeKitSybilResistant.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase._postDrawCheck" [ color = "orange" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "IProofOfHumanity.isRegistered" [ color = "orange" ];\n  "EvidenceModule.<Constructor>" -> "EvidenceModule._disableInitializers" [ color = "green" ];\n  "SafeERC20.increaseAllowance" -> "IERC20.approve" [ color = "orange" ];\n  "SafeERC20.increaseAllowance" -> "IERC20.allowance" [ color = "orange" ];\n  "SafeERC20.increaseAllowance" -> "SafeERC20.address" [ color = "green" ];\n  "SafeERC20.safeTransfer" -> "IERC20.UTION: When used with inheritance, manual care" [ color = "orange" ];\n  "SafeERC20.safeTransfer" -> "SafeERC20.address" [ color = "green" ];\n  "SafeERC20.safeTransfer" -> "abi.encodeCall" [ color = "orange" ];\n  "SafeERC20.safeTransferFrom" -> "IERC20.utomatically lock it when it is deployed:\n *\n * ```\n * //" [ color = "orange" ];\n  "SafeERC20.safeTransferFrom" -> "SafeERC20.address" [ color = "green" ];\n  "SafeERC20.safeTransferFrom" -> "abi.encodeCall" [ color = "orange" ];\n  "SafeSend.safeSend" -> "_to.send" [ color = "orange" ];\n  "RNGWithFallback.<Constructor>" -> "RNGWithFallback.address" [ color = "green" ];\n  "RNGWithFallback.<Constructor>" -> "RNGWithFallback.address" [ color = "green" ];\n  "IRNG.requestRandomness" -> "IRNG.requestRandomness" [ color = "orange" ];\n  "IRNG.receiveRandomness" -> "IRNG.receiveRandomness" [ color = "orange" ];\n  "IRNG.receiveRandomness" -> "RNGWithFallback.blockhash" [ color = "green" ];\n  "ChainlinkRNG.changeVrfCoordinator" -> "ChainlinkRNG.IVRFCoordinatorV2Plus" [ color = "green" ];\n  "ChainlinkRNG.changeVrfCoordinator" -> "ChainlinkRNG.CoordinatorSet" [ color = "green" ];\n  "IRNG.requestRandomness" -> "s_vrfCoordinator.requestRandomWords" [ color = "orange" ];\n  "IRNG.requestRandomness" -> "VRFV2PlusClient.RandomWordsRequest" [ color = "orange" ];\n  "IRNG.requestRandomness" -> "VRFV2PlusClient._argsToBytes" [ color = "orange" ];\n  "IRNG.requestRandomness" -> "VRFV2PlusClient.ExtraArgsV1" [ color = "orange" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable._authorizeUpgrade" [ color = "green" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.address" [ color = "green" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable._getImplementation" [ color = "green" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.UUPSUnauthorizedCallContext" [ color = "red" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.UUPSUnsupportedProxiableUUID" [ color = "red" ];\n  "UUPSProxiable.upgradeToAndCall" -> "newImplementation.delegatecall" [ color = "orange" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.FailedDelegateCall" [ color = "red" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.InvalidImplementation" [ color = "red" ];\n  "UUPSProxiable.proxiableUUID" -> "UUPSProxiable.address" [ color = "green" ];\n  "UUPSProxiable.proxiableUUID" -> "UUPSProxiable.UUPSUnauthorizedCallContext" [ color = "red" ];\n  "UUPSProxy.<Constructor>" -> "_implementation.delegatecall" [ color = "orange" ];\n  "UUPSProxy.<Fallback>" -> "UUPSProxy._delegate" [ color = "green" ];\n  "UUPSProxy.<Fallback>" -> "UUPSProxy._getImplementation" [ color = "green" ];\n  "UUPSProxy.<Receive Ether>" -> "UUPSProxy._delegate" [ color = "green" ];\n  "UUPSProxy.<Receive Ether>" -> "UUPSProxy._getImplementation" [ color = "green" ];\n  "Initializable.initializer" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable.initializer" -> "Initializable.address" [ color = "green" ];\n  "Initializable.initializer" -> "Initializable.AlreadyInitialized" [ color = "red" ];\n  "Initializable.reinitializer" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable.reinitializer" -> "Initializable.AlreadyInitialized" [ color = "red" ];\n  "Initializable.onlyInitializing" -> "Initializable._checkInitializing" [ color = "green" ];\n  "Initializable._checkInitializing" -> "Initializable._isInitializing" [ color = "green" ];\n  "Initializable._checkInitializing" -> "Initializable.NotInitializing" [ color = "red" ];\n  "Initializable._disableInitializers" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable._disableInitializers" -> "Initializable.AlreadyInitialized" [ color = "red" ];\n  "Initializable._disableInitializers" -> "Initializable.type" [ color = "green" ];\n  "Initializable._disableInitializers" -> "Initializable.type" [ color = "green" ];\n  "Initializable._disableInitializers" -> "Initializable.type" [ color = "green" ];\n  "Initializable._getInitializedVersion" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable._isInitializing" -> "Initializable._getInitializableStorage" [ color = "green" ];\n\n\nrankdir=LR\nnode [shape=plaintext]\nsubgraph cluster_01 { \nlabel = "Legend";\nkey [label=<<table border="0" cellpadding="2" cellspacing="0" cellborder="0">\n  <tr><td align="right" port="i1">Internal Call</td></tr>\n  <tr><td align="right" port="i2">External Call</td></tr>\n  <tr><td align="right" port="i2">Custom Error Call</td></tr>\n  <tr><td align="right" port="i3">Defined Contract</td></tr>\n  <tr><td align="right" port="i4">Undefined Contract</td></tr>\n  </table>>]\nkey2 [label=<<table border="0" cellpadding="2" cellspacing="0" cellborder="0">\n  <tr><td port="i1">&nbsp;&nbsp;&nbsp;</td></tr>\n  <tr><td port="i2">&nbsp;&nbsp;&nbsp;</td></tr>\n  <tr><td port="i3" bgcolor="lightgray">&nbsp;&nbsp;&nbsp;</td></tr>\n  <tr><td port="i4">\n    <table border="1" cellborder="0" cellspacing="0" cellpadding="7" color="lightgray">\n      <tr>\n       <td></td>\n      </tr>\n     </table>\n  </td></tr>\n  </table>>]\nkey:i1:e -> key2:i1:w [color="green"]\nkey:i2:e -> key2:i2:w [color="orange"]\nkey:i2:e -> key2:i2:w [color="red"]\n}\n}\n',
+            'digraph G {\n  graph [ ratio = "auto", page = "100", compound =true ];\nsubgraph "clusterKlerosCore" {\n  graph [ label = "KlerosCore", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "KlerosCore.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "KlerosCore.onlyByGuardianOrOwner" [ label = "onlyByGuardianOrOwner", color = "yellow" ];\n  "KlerosCore.whenPaused" [ label = "whenPaused", color = "yellow" ];\n  "KlerosCore.whenNotPaused" [ label = "whenNotPaused", color = "yellow" ];\n  "KlerosCore.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "KlerosCore.initialize" [ label = "initialize", color = "blue" ];\n  "KlerosCore._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "KlerosCore.pause" [ label = "pause", color = "blue" ];\n  "KlerosCore.unpause" [ label = "unpause", color = "blue" ];\n  "KlerosCore.executeOwnerProposal" [ label = "executeOwnerProposal", color = "blue" ];\n  "KlerosCore.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "KlerosCore.changeGuardian" [ label = "changeGuardian", color = "blue" ];\n  "KlerosCore.changePinakion" [ label = "changePinakion", color = "blue" ];\n  "KlerosCore.changeJurorProsecutionModule" [ label = "changeJurorProsecutionModule", color = "blue" ];\n  "KlerosCore.changeSortitionModule" [ label = "changeSortitionModule", color = "blue" ];\n  "KlerosCore.addNewDisputeKit" [ label = "addNewDisputeKit", color = "blue" ];\n  "KlerosCore.createCourt" [ label = "createCourt", color = "blue" ];\n  "KlerosCore.changeCourtParameters" [ label = "changeCourtParameters", color = "blue" ];\n  "KlerosCore.enableDisputeKits" [ label = "enableDisputeKits", color = "blue" ];\n  "KlerosCore.changeAcceptedFeeTokens" [ label = "changeAcceptedFeeTokens", color = "blue" ];\n  "KlerosCore.changeCurrencyRates" [ label = "changeCurrencyRates", color = "blue" ];\n  "KlerosCore.changeJurorNft" [ label = "changeJurorNft", color = "blue" ];\n  "KlerosCore.changeArbitrableWhitelist" [ label = "changeArbitrableWhitelist", color = "blue" ];\n  "KlerosCore.changeArbitrableWhitelistEnabled" [ label = "changeArbitrableWhitelistEnabled", color = "blue" ];\n  "KlerosCore.setStake" [ label = "setStake", color = "blue" ];\n  "KlerosCore.setStakeBySortitionModule" [ label = "setStakeBySortitionModule", color = "blue" ];\n  "KlerosCore.transferBySortitionModule" [ label = "transferBySortitionModule", color = "blue" ];\n  "KlerosCore.createDispute" [ label = "createDispute", color = "blue" ];\n  "KlerosCore._createDispute" [ label = "_createDispute" ];\n  "KlerosCore.passPeriod" [ label = "passPeriod", color = "blue" ];\n  "KlerosCore.draw" [ label = "draw", color = "blue" ];\n  "KlerosCore.appeal" [ label = "appeal", color = "blue" ];\n  "KlerosCore.execute" [ label = "execute", color = "blue" ];\n  "KlerosCore._executePenalties" [ label = "_executePenalties" ];\n  "KlerosCore._executeRewards" [ label = "_executeRewards" ];\n  "KlerosCore.executeRuling" [ label = "executeRuling", color = "blue" ];\n  "KlerosCore.arbitrationCost" [ label = "arbitrationCost" ];\n  "KlerosCore.appealCost" [ label = "appealCost" ];\n  "KlerosCore.appealPeriod" [ label = "appealPeriod" ];\n  "KlerosCore.currentRuling" [ label = "currentRuling" ];\n  "KlerosCore.getRoundInfo" [ label = "getRoundInfo", color = "blue" ];\n  "KlerosCore.getPnkAtStakePerJuror" [ label = "getPnkAtStakePerJuror", color = "blue" ];\n  "KlerosCore.getNumberOfRounds" [ label = "getNumberOfRounds" ];\n  "KlerosCore.isSupported" [ label = "isSupported", color = "blue" ];\n  "KlerosCore.getTimesPerPeriod" [ label = "getTimesPerPeriod", color = "blue" ];\n  "KlerosCore.getNumberOfVotes" [ label = "getNumberOfVotes" ];\n  "KlerosCore.isDisputeKitJumping" [ label = "isDisputeKitJumping", color = "blue" ];\n  "KlerosCore.getDisputeKitsLength" [ label = "getDisputeKitsLength", color = "blue" ];\n  "KlerosCore.convertEthToTokenAmount" [ label = "convertEthToTokenAmount" ];\n  "KlerosCore._isCourtJumping" [ label = "_isCourtJumping" ];\n  "KlerosCore._getCourtAndDisputeKitJumps" [ label = "_getCourtAndDisputeKitJumps" ];\n  "KlerosCore._transferFeeToken" [ label = "_transferFeeToken" ];\n  "KlerosCore._applyCoherence" [ label = "_applyCoherence" ];\n  "KlerosCore._calculatePnkAtStake" [ label = "_calculatePnkAtStake" ];\n  "KlerosCore._enableDisputeKit" [ label = "_enableDisputeKit" ];\n  "KlerosCore._setStake" [ label = "_setStake" ];\n  "KlerosCore._stakingFailed" [ label = "_stakingFailed" ];\n  "KlerosCore._extraDataToCourtIDMinJurorsDisputeKit" [ label = "_extraDataToCourtIDMinJurorsDisputeKit" ];\n  "KlerosCore.OwnerOnly" [ color = "brown2", shape =box ];\n  "KlerosCore.GuardianOrOwnerOnly" [ color = "brown2", shape =box ];\n  "KlerosCore.WhenPausedOnly" [ color = "brown2", shape =box ];\n  "KlerosCore.WhenNotPausedOnly" [ color = "brown2", shape =box ];\n  "KlerosCore._disableInitializers" [ label = "_disableInitializers" ];\n  "KlerosCore.UnsuccessfulCall" [ color = "brown2", shape =box ];\n  "KlerosCore.MinStakeLowerThanParentCourt" [ color = "brown2", shape =box ];\n  "KlerosCore.UnsupportedDisputeKit" [ color = "brown2", shape =box ];\n  "KlerosCore.InvalidForkingCourtAsParent" [ color = "brown2", shape =box ];\n  "KlerosCore.WrongDisputeKitIndex" [ color = "brown2", shape =box ];\n  "KlerosCore.MustSupportDisputeKitClassic" [ color = "brown2", shape =box ];\n  "KlerosCore.CannotDisableClassicDK" [ color = "brown2", shape =box ];\n  "KlerosCore.address" [ label = "address" ];\n  "KlerosCore.NotEligibleForStaking" [ color = "brown2", shape =box ];\n  "KlerosCore.SortitionModuleOnly" [ color = "brown2", shape =box ];\n  "KlerosCore.ArbitrationFeesNotEnough" [ color = "brown2", shape =box ];\n  "KlerosCore.TokenNotAccepted" [ color = "brown2", shape =box ];\n  "KlerosCore.TransferFailed" [ color = "brown2", shape =box ];\n  "KlerosCore.ArbitrableNotWhitelisted" [ color = "brown2", shape =box ];\n  "KlerosCore.DisputeKitNotSupportedByCourt" [ color = "brown2", shape =box ];\n  "KlerosCore.IERC20" [ label = "IERC20" ];\n  "KlerosCore.EvidenceNotPassedAndNotAppeal" [ color = "brown2", shape =box ];\n  "KlerosCore.DisputeStillDrawing" [ color = "brown2", shape =box ];\n  "KlerosCore.CommitPeriodNotPassed" [ color = "brown2", shape =box ];\n  "KlerosCore.VotePeriodNotPassed" [ color = "brown2", shape =box ];\n  "KlerosCore.AppealPeriodNotPassed" [ color = "brown2", shape =box ];\n  "KlerosCore.DisputePeriodIsFinal" [ color = "brown2", shape =box ];\n  "KlerosCore.NotEvidencePeriod" [ color = "brown2", shape =box ];\n  "KlerosCore.AppealFeesNotEnough" [ color = "brown2", shape =box ];\n  "KlerosCore.DisputeNotAppealable" [ color = "brown2", shape =box ];\n  "KlerosCore.DisputeKitOnly" [ color = "brown2", shape =box ];\n  "KlerosCore.NotExecutionPeriod" [ color = "brown2", shape =box ];\n  "KlerosCore.payable" [ label = "payable" ];\n  "KlerosCore.RulingAlreadyExecuted" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingTransferFailed" [ color = "brown2", shape =box ];\n  "KlerosCore.UnstakingTransferFailed" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingInTooManyCourts" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingNotPossibleInThisCourt" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingLessThanCourtMinStake" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingZeroWhenNoStake" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingMoreThanMaxStakePerJuror" [ color = "brown2", shape =box ];\n  "KlerosCore.StakingMoreThanMaxTotalStaked" [ color = "brown2", shape =box ];\n  "KlerosCore.courts" [ label = "courts" ];\n  "KlerosCore.sortitionModule" [ label = "sortitionModule" ];\n  "KlerosCore.disputes" [ label = "disputes" ];\n  "KlerosCore.paused" [ label = "paused" ];\n}\n\nsubgraph "clusterPolicyRegistry" {\n  graph [ label = "PolicyRegistry", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "PolicyRegistry.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "PolicyRegistry.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "PolicyRegistry.initialize" [ label = "initialize", color = "blue" ];\n  "PolicyRegistry._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "PolicyRegistry.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "PolicyRegistry.setPolicy" [ label = "setPolicy", color = "blue" ];\n  "PolicyRegistry.OwnerOnly" [ color = "brown2", shape =box ];\n  "PolicyRegistry._disableInitializers" [ label = "_disableInitializers" ];\n}\n\nsubgraph "clusterSortitionModule" {\n  graph [ label = "SortitionModule", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SortitionModule.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "SortitionModule.initialize" [ label = "initialize", color = "blue" ];\n  "SortitionModule.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "SortitionModule.onlyByCore" [ label = "onlyByCore", color = "yellow" ];\n  "SortitionModule._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "SortitionModule.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "SortitionModule.changeMinStakingTime" [ label = "changeMinStakingTime", color = "blue" ];\n  "SortitionModule.changeMaxDrawingTime" [ label = "changeMaxDrawingTime", color = "blue" ];\n  "SortitionModule.changeRandomNumberGenerator" [ label = "changeRandomNumberGenerator", color = "blue" ];\n  "SortitionModule.changeMaxStakePerJuror" [ label = "changeMaxStakePerJuror", color = "blue" ];\n  "SortitionModule.changeMaxTotalStaked" [ label = "changeMaxTotalStaked", color = "blue" ];\n  "SortitionModule.passPhase" [ label = "passPhase", color = "blue" ];\n  "ISortitionModule.createTree" [ label = "createTree", color = "blue" ];\n  "SortitionModule.executeDelayedStakes" [ label = "executeDelayedStakes", color = "blue" ];\n  "ISortitionModule.createDisputeHook" [ label = "createDisputeHook", color = "blue" ];\n  "ISortitionModule.postDrawHook" [ label = "postDrawHook", color = "blue" ];\n  "SortitionModule.notifyRandomNumber" [ label = "notifyRandomNumber", color = "green" ];\n  "ISortitionModule.validateStake" [ label = "validateStake", color = "blue" ];\n  "SortitionModule._validateStake" [ label = "_validateStake" ];\n  "ISortitionModule.setStake" [ label = "setStake", color = "blue" ];\n  "ISortitionModule.setStakePenalty" [ label = "setStakePenalty", color = "blue" ];\n  "ISortitionModule.setStakeReward" [ label = "setStakeReward", color = "blue" ];\n  "SortitionModule._setStake" [ label = "_setStake" ];\n  "ISortitionModule.lockStake" [ label = "lockStake", color = "blue" ];\n  "ISortitionModule.unlockStake" [ label = "unlockStake", color = "blue" ];\n  "ISortitionModule.forcedUnstakeAllCourts" [ label = "forcedUnstakeAllCourts", color = "blue" ];\n  "ISortitionModule.forcedUnstake" [ label = "forcedUnstake", color = "blue" ];\n  "SortitionModule.withdrawLeftoverPNK" [ label = "withdrawLeftoverPNK", color = "blue" ];\n  "SortitionModule.draw" [ label = "draw", color = "green" ];\n  "SortitionModule.stakeOf" [ label = "stakeOf" ];\n  "SortitionModule.getJurorBalance" [ label = "getJurorBalance", color = "blue" ];\n  "SortitionModule.getJurorCourtIDs" [ label = "getJurorCourtIDs" ];\n  "SortitionModule.isJurorStaked" [ label = "isJurorStaked", color = "blue" ];\n  "SortitionModule.getJurorLeftoverPNK" [ label = "getJurorLeftoverPNK" ];\n  "SortitionModule._extraDataToTreeK" [ label = "_extraDataToTreeK" ];\n  "SortitionModule._disableInitializers" [ label = "_disableInitializers" ];\n  "SortitionModule.OwnerOnly" [ color = "brown2", shape =box ];\n  "SortitionModule.address" [ label = "address" ];\n  "SortitionModule.KlerosCoreOnly" [ color = "brown2", shape =box ];\n  "SortitionModule.MinStakingTimeNotPassed" [ color = "brown2", shape =box ];\n  "SortitionModule.NoDisputesThatNeedJurors" [ color = "brown2", shape =box ];\n  "SortitionModule.RandomNumberNotReady" [ color = "brown2", shape =box ];\n  "SortitionModule.DisputesWithoutJurorsAndMaxDrawingTimeNotPassed" [ color = "brown2", shape =box ];\n  "SortitionModule.NotStakingPhase" [ color = "brown2", shape =box ];\n  "SortitionModule.NoDelayedStakeToExecute" [ color = "brown2", shape =box ];\n  "SortitionModule.NotEligibleForWithdrawal" [ color = "brown2", shape =box ];\n  "SortitionModule.NotDrawingPhase" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterDisputeResolver" {\n  graph [ label = "DisputeResolver", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeResolver.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeResolver.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "DisputeResolver.changeArbitrator" [ label = "changeArbitrator", color = "blue" ];\n  "DisputeResolver.changeTemplateRegistry" [ label = "changeTemplateRegistry", color = "blue" ];\n  "DisputeResolver.createDisputeForTemplate" [ label = "createDisputeForTemplate", color = "blue" ];\n  "DisputeResolver.createDisputeForTemplateUri" [ label = "createDisputeForTemplateUri", color = "blue" ];\n  "DisputeResolver.rule" [ label = "rule", color = "blue" ];\n  "DisputeResolver._createDispute" [ label = "_createDispute" ];\n  "DisputeResolver.OwnerOnly" [ color = "brown2", shape =box ];\n  "DisputeResolver.address" [ label = "address" ];\n  "DisputeResolver.ArbitratorOnly" [ color = "brown2", shape =box ];\n  "DisputeResolver.RulingOutOfBounds" [ color = "brown2", shape =box ];\n  "DisputeResolver.DisputeAlreadyRuled" [ color = "brown2", shape =box ];\n  "DisputeResolver.ShouldBeAtLeastTwoRulingOptions" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterDisputeTemplateRegistry" {\n  graph [ label = "DisputeTemplateRegistry", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeTemplateRegistry.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "DisputeTemplateRegistry.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeTemplateRegistry.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeTemplateRegistry._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeTemplateRegistry.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "IDisputeTemplateRegistry.setDisputeTemplate" [ label = "setDisputeTemplate", color = "blue" ];\n  "DisputeTemplateRegistry.OwnerOnly" [ color = "brown2", shape =box ];\n  "DisputeTemplateRegistry._disableInitializers" [ label = "_disableInitializers" ];\n}\n\nsubgraph "clusterDisputeKitClassic" {\n  graph [ label = "DisputeKitClassic", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitClassic.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitClassic.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitClassic._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitClassic._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitClassic.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterDisputeKitClassicBase" {\n  graph [ label = "DisputeKitClassicBase", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitClassicBase.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "DisputeKitClassicBase.onlyByCore" [ label = "onlyByCore", color = "yellow" ];\n  "DisputeKitClassicBase.notJumped" [ label = "notJumped", color = "yellow" ];\n  "DisputeKitClassicBase.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize", color = "white" ];\n  "DisputeKitClassicBase.executeOwnerProposal" [ label = "executeOwnerProposal", color = "blue" ];\n  "DisputeKitClassicBase.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "DisputeKitClassicBase.changeCore" [ label = "changeCore", color = "blue" ];\n  "DisputeKitClassicBase.changeJumpDisputeKitID" [ label = "changeJumpDisputeKitID", color = "blue" ];\n  "IDisputeKit.createDispute" [ label = "createDispute", color = "blue" ];\n  "IDisputeKit.draw" [ label = "draw", color = "blue" ];\n  "DisputeKitClassicBase.castCommit" [ label = "castCommit", color = "blue" ];\n  "DisputeKitClassicBase._castCommit" [ label = "_castCommit" ];\n  "DisputeKitClassicBase.castVote" [ label = "castVote", color = "blue" ];\n  "DisputeKitClassicBase._castVote" [ label = "_castVote" ];\n  "DisputeKitClassicBase.fundAppeal" [ label = "fundAppeal", color = "blue" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" [ label = "withdrawFeesAndRewards", color = "blue" ];\n  "DisputeKitClassicBase.hashVote" [ label = "hashVote" ];\n  "DisputeKitClassicBase.getFundedChoices" [ label = "getFundedChoices" ];\n  "IDisputeKit.currentRuling" [ label = "currentRuling", color = "blue" ];\n  "IDisputeKit.getDegreeOfCoherenceReward" [ label = "getDegreeOfCoherenceReward", color = "blue" ];\n  "IDisputeKit.getDegreeOfCoherencePenalty" [ label = "getDegreeOfCoherencePenalty", color = "blue" ];\n  "DisputeKitClassicBase._getDegreeOfCoherence" [ label = "_getDegreeOfCoherence" ];\n  "IDisputeKit.getCoherentCount" [ label = "getCoherentCount", color = "blue" ];\n  "DisputeKitClassicBase.areCommitsAllCast" [ label = "areCommitsAllCast", color = "blue" ];\n  "DisputeKitClassicBase.areVotesAllCast" [ label = "areVotesAllCast", color = "blue" ];\n  "DisputeKitClassicBase.isAppealFunded" [ label = "isAppealFunded", color = "blue" ];\n  "DisputeKitClassicBase.earlyCourtJump" [ label = "earlyCourtJump", color = "blue" ];\n  "DisputeKitClassicBase.getNbVotesAfterAppeal" [ label = "getNbVotesAfterAppeal", color = "blue" ];\n  "DisputeKitClassicBase.getJumpDisputeKitID" [ label = "getJumpDisputeKitID", color = "blue" ];\n  "IDisputeKit.isVoteActive" [ label = "isVoteActive", color = "blue" ];\n  "DisputeKitClassicBase.getRoundInfo" [ label = "getRoundInfo", color = "blue" ];\n  "DisputeKitClassicBase.getNumberOfRounds" [ label = "getNumberOfRounds", color = "blue" ];\n  "DisputeKitClassicBase.getLocalDisputeRoundID" [ label = "getLocalDisputeRoundID", color = "blue" ];\n  "DisputeKitClassicBase.getVoteInfo" [ label = "getVoteInfo", color = "blue" ];\n  "DisputeKitClassicBase._getExpectedVoteHash" [ label = "_getExpectedVoteHash" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck" ];\n  "DisputeKitClassicBase.OwnerOnly" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.address" [ label = "address" ];\n  "DisputeKitClassicBase.KlerosCoreOnly" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.DisputeJumpedToParentDK" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.UnsuccessfulCall" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.NotCommitPeriod" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.EmptyCommit" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.NotActiveForCoreDisputeID" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.JurorHasToOwnTheVote" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.NotVotePeriod" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.EmptyVoteIDs" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.ChoiceOutOfBounds" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.HashDoesNotMatchHiddenVoteCommitment" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.VoteAlreadyCast" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.AppealPeriodIsOver" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.AppealPeriodIsOverForLoser" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.AppealFeeIsAlreadyPaid" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.payable" [ label = "payable" ];\n  "DisputeKitClassicBase.DisputeNotResolved" [ color = "brown2", shape =box ];\n  "DisputeKitClassicBase.CoreIsPaused" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterIBalanceHolder" {\n  graph [ label = "IBalanceHolder  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IBalanceHolder.balanceOf" [ label = "balanceOf", color = "blue" ];\n}\n\nsubgraph "clusterIBalanceHolderERC1155" {\n  graph [ label = "IBalanceHolderERC1155  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IBalanceHolderERC1155.balanceOf" [ label = "balanceOf", color = "blue" ];\n}\n\nsubgraph "clusterDisputeKitGated" {\n  graph [ label = "DisputeKitGated", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitGated.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitGated.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitGated._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitGated.extraDataToTokenInfo" [ label = "extraDataToTokenInfo", color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck", color = "white" ];\n  "DisputeKitGated._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitGated.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterDisputeKitGatedShutter" {\n  graph [ label = "DisputeKitGatedShutter", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitGatedShutter.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitGatedShutter.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitGatedShutter._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitGatedShutter.castCommitShutter" [ label = "castCommitShutter", color = "blue" ];\n  "DisputeKitGatedShutter.castVoteShutter" [ label = "castVoteShutter", color = "blue" ];\n  "DisputeKitClassicBase.hashVote" [ label = "hashVote", color = "green" ];\n  "DisputeKitClassicBase._getExpectedVoteHash" [ label = "_getExpectedVoteHash", color = "white" ];\n  "DisputeKitGatedShutter._extraDataToTokenInfo" [ label = "_extraDataToTokenInfo", color = "white" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck", color = "white" ];\n  "DisputeKitGatedShutter._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitGatedShutter.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n  "DisputeKitGatedShutter.EmptyRecoveryCommit" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterDisputeKitShutter" {\n  graph [ label = "DisputeKitShutter", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitShutter.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitShutter.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitShutter._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitShutter.castCommitShutter" [ label = "castCommitShutter", color = "blue" ];\n  "DisputeKitShutter.castVoteShutter" [ label = "castVoteShutter", color = "blue" ];\n  "DisputeKitClassicBase.hashVote" [ label = "hashVote", color = "green" ];\n  "DisputeKitClassicBase._getExpectedVoteHash" [ label = "_getExpectedVoteHash", color = "white" ];\n  "DisputeKitShutter._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitShutter.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n  "DisputeKitShutter.EmptyRecoveryCommit" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterIProofOfHumanity" {\n  graph [ label = "IProofOfHumanity  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IProofOfHumanity.isRegistered" [ label = "isRegistered" ];\n}\n\nsubgraph "clusterDisputeKitSybilResistant" {\n  graph [ label = "DisputeKitSybilResistant", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "DisputeKitSybilResistant.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "DisputeKitSybilResistant.initialize" [ label = "initialize", color = "blue" ];\n  "DisputeKitSybilResistant._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "DisputeKitClassicBase._postDrawCheck" [ label = "_postDrawCheck", color = "white" ];\n  "DisputeKitSybilResistant._disableInitializers" [ label = "_disableInitializers" ];\n  "DisputeKitSybilResistant.__DisputeKitClassicBase_initialize" [ label = "__DisputeKitClassicBase_initialize" ];\n}\n\nsubgraph "clusterEvidenceModule" {\n  graph [ label = "EvidenceModule", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "EvidenceModule.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "EvidenceModule.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "EvidenceModule.initialize" [ label = "initialize", color = "blue" ];\n  "EvidenceModule._authorizeUpgrade" [ label = "_authorizeUpgrade", color = "white" ];\n  "EvidenceModule.submitEvidence" [ label = "submitEvidence", color = "blue" ];\n  "EvidenceModule.OwnerOnly" [ color = "brown2", shape =box ];\n  "EvidenceModule._disableInitializers" [ label = "_disableInitializers" ];\n}\n\nsubgraph "clusterIArbitrableV2" {\n  graph [ label = "IArbitrableV2  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IArbitrableV2.rule" [ label = "rule", color = "blue" ];\n}\n\nsubgraph "clusterIArbitratorV2" {\n  graph [ label = "IArbitratorV2  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IArbitratorV2.createDispute" [ label = "createDispute", color = "blue" ];\n  "IArbitratorV2.arbitrationCost" [ label = "arbitrationCost", color = "blue" ];\n  "IArbitratorV2.currentRuling" [ label = "currentRuling", color = "blue" ];\n}\n\nsubgraph "clusterIDisputeKit" {\n  graph [ label = "IDisputeKit  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IDisputeKit.createDispute" [ label = "createDispute", color = "blue" ];\n  "IDisputeKit.draw" [ label = "draw", color = "blue" ];\n  "IDisputeKit.getCoherentCount" [ label = "getCoherentCount", color = "blue" ];\n  "IDisputeKit.getDegreeOfCoherencePenalty" [ label = "getDegreeOfCoherencePenalty", color = "blue" ];\n  "IDisputeKit.isVoteActive" [ label = "isVoteActive", color = "blue" ];\n  "IDisputeKit.getDegreeOfCoherenceReward" [ label = "getDegreeOfCoherenceReward", color = "blue" ];\n  "IDisputeKit.currentRuling" [ label = "currentRuling", color = "blue" ];\n  "IDisputeKit.areCommitsAllCast" [ label = "areCommitsAllCast", color = "blue" ];\n  "IDisputeKit.areVotesAllCast" [ label = "areVotesAllCast", color = "blue" ];\n  "IDisputeKit.isAppealFunded" [ label = "isAppealFunded", color = "blue" ];\n  "IDisputeKit.earlyCourtJump" [ label = "earlyCourtJump", color = "blue" ];\n  "IDisputeKit.getNbVotesAfterAppeal" [ label = "getNbVotesAfterAppeal", color = "blue" ];\n  "IDisputeKit.getJumpDisputeKitID" [ label = "getJumpDisputeKitID", color = "blue" ];\n  "IDisputeKit.getRoundInfo" [ label = "getRoundInfo", color = "blue" ];\n  "IDisputeKit.getVoteInfo" [ label = "getVoteInfo", color = "blue" ];\n}\n\nsubgraph "clusterIDisputeTemplateRegistry" {\n  graph [ label = "IDisputeTemplateRegistry  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IDisputeTemplateRegistry.setDisputeTemplate" [ label = "setDisputeTemplate", color = "blue" ];\n}\n\nsubgraph "clusterIEvidence" {\n  graph [ label = "IEvidence  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n}\n\nsubgraph "clusterISortitionModule" {\n  graph [ label = "ISortitionModule  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "ISortitionModule.createTree" [ label = "createTree", color = "blue" ];\n  "ISortitionModule.createDisputeHook" [ label = "createDisputeHook", color = "blue" ];\n  "ISortitionModule.lockStake" [ label = "lockStake", color = "blue" ];\n  "ISortitionModule.postDrawHook" [ label = "postDrawHook", color = "blue" ];\n  "ISortitionModule.unlockStake" [ label = "unlockStake", color = "blue" ];\n  "ISortitionModule.setStakePenalty" [ label = "setStakePenalty", color = "blue" ];\n  "ISortitionModule.forcedUnstakeAllCourts" [ label = "forcedUnstakeAllCourts", color = "blue" ];\n  "ISortitionModule.forcedUnstake" [ label = "forcedUnstake", color = "blue" ];\n  "ISortitionModule.setStakeReward" [ label = "setStakeReward", color = "blue" ];\n  "ISortitionModule.validateStake" [ label = "validateStake", color = "blue" ];\n  "ISortitionModule.setStake" [ label = "setStake", color = "blue" ];\n  "ISortitionModule.draw" [ label = "draw", color = "blue" ];\n  "ISortitionModule.notifyRandomNumber" [ label = "notifyRandomNumber", color = "blue" ];\n  "ISortitionModule.getJurorBalance" [ label = "getJurorBalance", color = "blue" ];\n  "ISortitionModule.getJurorCourtIDs" [ label = "getJurorCourtIDs", color = "blue" ];\n  "ISortitionModule.isJurorStaked" [ label = "isJurorStaked", color = "blue" ];\n  "ISortitionModule.getJurorLeftoverPNK" [ label = "getJurorLeftoverPNK", color = "blue" ];\n  "ISortitionModule.withdrawLeftoverPNK" [ label = "withdrawLeftoverPNK", color = "blue" ];\n}\n\nsubgraph "clusterSafeERC20" {\n  graph [ label = "SafeERC20  (lib)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SafeERC20.increaseAllowance" [ label = "increaseAllowance", color = "white" ];\n  "SafeERC20.safeTransfer" [ label = "safeTransfer", color = "white" ];\n  "SafeERC20.safeTransferFrom" [ label = "safeTransferFrom", color = "white" ];\n  "SafeERC20.address" [ label = "address" ];\n}\n\nsubgraph "clusterWethLike" {\n  graph [ label = "WethLike  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "WethLike.deposit" [ label = "deposit", color = "blue" ];\n  "WethLike.transfer" [ label = "transfer", color = "blue" ];\n}\n\nsubgraph "clusterSafeSend" {\n  graph [ label = "SafeSend  (lib)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "SafeSend.safeSend" [ label = "safeSend", color = "white" ];\n}\n\nsubgraph "clusterRNGWithFallback" {\n  graph [ label = "RNGWithFallback", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "RNGWithFallback.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "RNGWithFallback.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "RNGWithFallback.onlyByConsumer" [ label = "onlyByConsumer", color = "yellow" ];\n  "RNGWithFallback.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "RNGWithFallback.changeConsumer" [ label = "changeConsumer", color = "blue" ];\n  "RNGWithFallback.changeFallbackTimeout" [ label = "changeFallbackTimeout", color = "blue" ];\n  "IRNG.requestRandomness" [ label = "requestRandomness", color = "blue" ];\n  "IRNG.receiveRandomness" [ label = "receiveRandomness", color = "blue" ];\n  "RNGWithFallback.address" [ label = "address" ];\n  "RNGWithFallback.InvalidDefaultRNG" [ color = "brown2", shape =box ];\n  "RNGWithFallback.OwnerOnly" [ color = "brown2", shape =box ];\n  "RNGWithFallback.ConsumerOnly" [ color = "brown2", shape =box ];\n  "RNGWithFallback.blockhash" [ label = "blockhash" ];\n}\n\nsubgraph "clusterChainlinkRNG" {\n  graph [ label = "ChainlinkRNG", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "ChainlinkRNG.onlyByOwner" [ label = "onlyByOwner", color = "yellow" ];\n  "ChainlinkRNG.onlyByConsumer" [ label = "onlyByConsumer", color = "yellow" ];\n  "ChainlinkRNG.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "ChainlinkRNG.changeOwner" [ label = "changeOwner", color = "blue" ];\n  "ChainlinkRNG.changeConsumer" [ label = "changeConsumer", color = "blue" ];\n  "ChainlinkRNG.changeVrfCoordinator" [ label = "changeVrfCoordinator", color = "blue" ];\n  "ChainlinkRNG.changeKeyHash" [ label = "changeKeyHash", color = "blue" ];\n  "ChainlinkRNG.changeSubscriptionId" [ label = "changeSubscriptionId", color = "blue" ];\n  "ChainlinkRNG.changeRequestConfirmations" [ label = "changeRequestConfirmations", color = "blue" ];\n  "ChainlinkRNG.changeCallbackGasLimit" [ label = "changeCallbackGasLimit", color = "blue" ];\n  "IRNG.requestRandomness" [ label = "requestRandomness", color = "blue" ];\n  "ChainlinkRNG.fulfillRandomWords" [ label = "fulfillRandomWords", color = "white" ];\n  "IRNG.receiveRandomness" [ label = "receiveRandomness", color = "blue" ];\n  "ChainlinkRNG.OwnerOnly" [ color = "brown2", shape =box ];\n  "ChainlinkRNG.ConsumerOnly" [ color = "brown2", shape =box ];\n  "ChainlinkRNG.IVRFCoordinatorV2Plus" [ label = "IVRFCoordinatorV2Plus" ];\n  "ChainlinkRNG.CoordinatorSet" [ label = "CoordinatorSet" ];\n}\n\nsubgraph "clusterIRNG" {\n  graph [ label = "IRNG  (iface)", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "IRNG.requestRandomness" [ label = "requestRandomness", color = "blue" ];\n  "IRNG.receiveRandomness" [ label = "receiveRandomness", color = "blue" ];\n}\n\nsubgraph "clusterUUPSProxiable" {\n  graph [ label = "UUPSProxiable", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "UUPSProxiable._authorizeUpgrade" [ label = "_authorizeUpgrade" ];\n  "UUPSProxiable.upgradeToAndCall" [ label = "upgradeToAndCall", color = "green" ];\n  "UUPSProxiable.proxiableUUID" [ label = "proxiableUUID", color = "blue" ];\n  "UUPSProxiable.version" [ label = "version", color = "blue" ];\n  "UUPSProxiable._getImplementation" [ label = "_getImplementation" ];\n  "UUPSProxiable.address" [ label = "address" ];\n  "UUPSProxiable.UUPSUnauthorizedCallContext" [ color = "brown2", shape =box ];\n  "UUPSProxiable.UUPSUnsupportedProxiableUUID" [ color = "brown2", shape =box ];\n  "UUPSProxiable.FailedDelegateCall" [ color = "brown2", shape =box ];\n  "UUPSProxiable.InvalidImplementation" [ color = "brown2", shape =box ];\n}\n\nsubgraph "clusterUUPSProxy" {\n  graph [ label = "UUPSProxy", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "UUPSProxy.<Constructor>" [ label = "<Constructor>", color = "green" ];\n  "UUPSProxy._delegate" [ label = "_delegate" ];\n  "UUPSProxy._getImplementation" [ label = "_getImplementation" ];\n  "UUPSProxy.<Fallback>" [ label = "<Fallback>", color = "blue" ];\n  "UUPSProxy.<Receive Ether>" [ label = "<Receive Ether>", color = "blue" ];\n}\n\nsubgraph "clusterInitializable" {\n  graph [ label = "Initializable", color = "lightgray", style = "filled", bgcolor = "lightgray" ];\n  "Initializable.initializer" [ label = "initializer", color = "yellow" ];\n  "Initializable.reinitializer" [ label = "reinitializer", color = "yellow" ];\n  "Initializable.onlyInitializing" [ label = "onlyInitializing", color = "yellow" ];\n  "Initializable._checkInitializing" [ label = "_checkInitializing" ];\n  "Initializable._disableInitializers" [ label = "_disableInitializers", color = "white" ];\n  "Initializable._getInitializedVersion" [ label = "_getInitializedVersion", color = "white" ];\n  "Initializable._isInitializing" [ label = "_isInitializing" ];\n  "Initializable._getInitializableStorage" [ label = "_getInitializableStorage" ];\n  "Initializable.address" [ label = "address" ];\n  "Initializable.AlreadyInitialized" [ color = "brown2", shape =box ];\n  "Initializable.NotInitializing" [ color = "brown2", shape =box ];\n  "Initializable.type" [ label = "type" ];\n}\n\nsubgraph "clusterIERC721" {\n  graph [ label = "IERC721", color = "lightgray" ];\n  "IERC721.balanceOf" [ label = "balanceOf" ];\n}\n\nsubgraph "clusterIERC20" {\n  graph [ label = "IERC20", color = "lightgray" ];\n  "IERC20.safeTransfer" [ label = "safeTransfer" ];\n  "IERC20.safeTransferFrom" [ label = "safeTransferFrom" ];\n  "IERC20.approve" [ label = "approve" ];\n  "IERC20.allowance" [ label = "allowance" ];\n  "IERC20.UTION: When used with inheritance, manual care" [ label = "UTION: When used with inheritance, manual care" ];\n  "IERC20.utomatically lock it when it is deployed:\n *\n * ```\n * //" [ label = "utomatically lock it when it is deployed:\n *\n * ```\n * //" ];\n}\n\nsubgraph "cluster_recipient" {\n  graph [ label = "_recipient", color = "lightgray" ];\n  "_recipient.safeSend" [ label = "safeSend" ];\n}\n\nsubgraph "clusterCourtID" {\n  graph [ label = "CourtID", color = "lightgray" ];\n  "CourtID.wrap" [ label = "wrap" ];\n}\n\nsubgraph "clustersortitionSumTrees" {\n  graph [ label = "sortitionSumTrees", color = "lightgray" ];\n  "sortitionSumTrees.createTree" [ label = "createTree" ];\n}\n\nsubgraph "clusterSortitionTrees" {\n  graph [ label = "SortitionTrees", color = "lightgray" ];\n  "SortitionTrees.toStakePathID" [ label = "toStakePathID" ];\n}\n\nsubgraph "cluster_beneficiary" {\n  graph [ label = "_beneficiary", color = "lightgray" ];\n  "_beneficiary.safeSend" [ label = "safeSend" ];\n}\n\nsubgraph "clusterabi" {\n  graph [ label = "abi", color = "lightgray" ];\n  "abi.encodeCall" [ label = "encodeCall" ];\n}\n\nsubgraph "cluster_to" {\n  graph [ label = "_to", color = "lightgray" ];\n  "_to.send" [ label = "send" ];\n}\n\nsubgraph "clusters_vrfCoordinator" {\n  graph [ label = "s_vrfCoordinator", color = "lightgray" ];\n  "s_vrfCoordinator.requestRandomWords" [ label = "requestRandomWords" ];\n}\n\nsubgraph "clusterVRFV2PlusClient" {\n  graph [ label = "VRFV2PlusClient", color = "lightgray" ];\n  "VRFV2PlusClient.RandomWordsRequest" [ label = "RandomWordsRequest" ];\n  "VRFV2PlusClient._argsToBytes" [ label = "_argsToBytes" ];\n  "VRFV2PlusClient.ExtraArgsV1" [ label = "ExtraArgsV1" ];\n}\n\nsubgraph "clusternewImplementation" {\n  graph [ label = "newImplementation", color = "lightgray" ];\n  "newImplementation.delegatecall" [ label = "delegatecall" ];\n}\n\nsubgraph "cluster_implementation" {\n  graph [ label = "_implementation", color = "lightgray" ];\n  "_implementation.delegatecall" [ label = "delegatecall" ];\n}\n\n  "KlerosCore.onlyByOwner";\n  "KlerosCore.OwnerOnly";\n  "KlerosCore.onlyByGuardianOrOwner";\n  "KlerosCore.GuardianOrOwnerOnly";\n  "KlerosCore.whenPaused";\n  "KlerosCore.WhenPausedOnly";\n  "KlerosCore.whenNotPaused";\n  "KlerosCore.WhenNotPausedOnly";\n  "KlerosCore.<Constructor>";\n  "KlerosCore._disableInitializers";\n  "KlerosCore.initialize";\n  "ISortitionModule.createTree";\n  "KlerosCore._enableDisputeKit";\n  "KlerosCore.executeOwnerProposal";\n  "KlerosCore.UnsuccessfulCall";\n  "KlerosCore.createCourt";\n  "KlerosCore.MinStakeLowerThanParentCourt";\n  "KlerosCore.UnsupportedDisputeKit";\n  "KlerosCore.InvalidForkingCourtAsParent";\n  "KlerosCore.WrongDisputeKitIndex";\n  "KlerosCore.MustSupportDisputeKitClassic";\n  "KlerosCore.changeCourtParameters";\n  "KlerosCore.enableDisputeKits";\n  "KlerosCore.CannotDisableClassicDK";\n  "KlerosCore.setStake";\n  "KlerosCore.address";\n  "IERC721.balanceOf";\n  "KlerosCore.NotEligibleForStaking";\n  "KlerosCore._setStake";\n  "KlerosCore.setStakeBySortitionModule";\n  "KlerosCore.SortitionModuleOnly";\n  "KlerosCore.transferBySortitionModule";\n  "IERC20.safeTransfer";\n  "KlerosCore.createDispute";\n  "KlerosCore.arbitrationCost";\n  "KlerosCore.ArbitrationFeesNotEnough";\n  "KlerosCore._createDispute";\n  "KlerosCore.TokenNotAccepted";\n  "IERC20.safeTransferFrom";\n  "KlerosCore.TransferFailed";\n  "KlerosCore.ArbitrableNotWhitelisted";\n  "KlerosCore._extraDataToCourtIDMinJurorsDisputeKit";\n  "KlerosCore.DisputeKitNotSupportedByCourt";\n  "KlerosCore.convertEthToTokenAmount";\n  "KlerosCore._calculatePnkAtStake";\n  "KlerosCore.IERC20";\n  "ISortitionModule.createDisputeHook";\n  "IDisputeKit.createDispute";\n  "KlerosCore.passPeriod";\n  "KlerosCore.EvidenceNotPassedAndNotAppeal";\n  "KlerosCore.DisputeStillDrawing";\n  "KlerosCore.CommitPeriodNotPassed";\n  "KlerosCore.VotePeriodNotPassed";\n  "KlerosCore.AppealPeriodNotPassed";\n  "KlerosCore.DisputePeriodIsFinal";\n  "KlerosCore.draw";\n  "KlerosCore.NotEvidencePeriod";\n  "IDisputeKit.draw";\n  "ISortitionModule.lockStake";\n  "ISortitionModule.postDrawHook";\n  "KlerosCore.appeal";\n  "KlerosCore.appealCost";\n  "KlerosCore.AppealFeesNotEnough";\n  "KlerosCore.DisputeNotAppealable";\n  "KlerosCore.DisputeKitOnly";\n  "KlerosCore._getCourtAndDisputeKitJumps";\n  "KlerosCore.execute";\n  "KlerosCore.NotExecutionPeriod";\n  "IDisputeKit.getCoherentCount";\n  "KlerosCore._executePenalties";\n  "KlerosCore._executeRewards";\n  "IDisputeKit.getDegreeOfCoherencePenalty";\n  "ISortitionModule.unlockStake";\n  "ISortitionModule.setStakePenalty";\n  "IDisputeKit.isVoteActive";\n  "ISortitionModule.forcedUnstakeAllCourts";\n  "ISortitionModule.forcedUnstake";\n  "KlerosCore._transferFeeToken";\n  "KlerosCore.payable";\n  "IDisputeKit.getDegreeOfCoherenceReward";\n  "KlerosCore._applyCoherence";\n  "ISortitionModule.setStakeReward";\n  "KlerosCore.executeRuling";\n  "KlerosCore.RulingAlreadyExecuted";\n  "KlerosCore.currentRuling";\n  "IDisputeKit.currentRuling";\n  "KlerosCore.isDisputeKitJumping";\n  "KlerosCore._isCourtJumping";\n  "_recipient.safeSend";\n  "KlerosCore._stakingFailed";\n  "ISortitionModule.validateStake";\n  "ISortitionModule.setStake";\n  "KlerosCore.StakingTransferFailed";\n  "KlerosCore.UnstakingTransferFailed";\n  "KlerosCore.StakingInTooManyCourts";\n  "KlerosCore.StakingNotPossibleInThisCourt";\n  "KlerosCore.StakingLessThanCourtMinStake";\n  "KlerosCore.StakingZeroWhenNoStake";\n  "KlerosCore.StakingMoreThanMaxStakePerJuror";\n  "KlerosCore.StakingMoreThanMaxTotalStaked";\n  "PolicyRegistry.onlyByOwner";\n  "PolicyRegistry.OwnerOnly";\n  "PolicyRegistry.<Constructor>";\n  "PolicyRegistry._disableInitializers";\n  "SortitionModule.<Constructor>";\n  "SortitionModule._disableInitializers";\n  "SortitionModule.onlyByOwner";\n  "SortitionModule.OwnerOnly";\n  "SortitionModule.onlyByCore";\n  "SortitionModule.address";\n  "SortitionModule.KlerosCoreOnly";\n  "SortitionModule.changeRandomNumberGenerator";\n  "IRNG.requestRandomness";\n  "SortitionModule.passPhase";\n  "SortitionModule.MinStakingTimeNotPassed";\n  "SortitionModule.NoDisputesThatNeedJurors";\n  "IRNG.receiveRandomness";\n  "SortitionModule.RandomNumberNotReady";\n  "SortitionModule.DisputesWithoutJurorsAndMaxDrawingTimeNotPassed";\n  "CourtID.wrap";\n  "SortitionModule._extraDataToTreeK";\n  "sortitionSumTrees.createTree";\n  "SortitionModule.executeDelayedStakes";\n  "SortitionModule.NotStakingPhase";\n  "SortitionModule.NoDelayedStakeToExecute";\n  "SortitionModule._validateStake";\n  "SortitionModule.stakeOf";\n  "SortitionModule._setStake";\n  "SortitionTrees.toStakePathID";\n  "KlerosCore.courts";\n  "SortitionModule.getJurorLeftoverPNK";\n  "SortitionModule.getJurorCourtIDs";\n  "SortitionModule.withdrawLeftoverPNK";\n  "SortitionModule.NotEligibleForWithdrawal";\n  "SortitionModule.draw";\n  "SortitionModule.NotDrawingPhase";\n  "SortitionModule.getJurorBalance";\n  "DisputeResolver.changeOwner";\n  "DisputeResolver.OwnerOnly";\n  "DisputeResolver.changeArbitrator";\n  "DisputeResolver.changeTemplateRegistry";\n  "DisputeResolver.createDisputeForTemplate";\n  "DisputeResolver._createDispute";\n  "DisputeResolver.createDisputeForTemplateUri";\n  "DisputeResolver.rule";\n  "DisputeResolver.address";\n  "DisputeResolver.ArbitratorOnly";\n  "DisputeResolver.RulingOutOfBounds";\n  "DisputeResolver.DisputeAlreadyRuled";\n  "DisputeResolver.ShouldBeAtLeastTwoRulingOptions";\n  "IDisputeTemplateRegistry.setDisputeTemplate";\n  "DisputeTemplateRegistry.onlyByOwner";\n  "DisputeTemplateRegistry.OwnerOnly";\n  "DisputeTemplateRegistry.<Constructor>";\n  "DisputeTemplateRegistry._disableInitializers";\n  "DisputeKitClassic.<Constructor>";\n  "DisputeKitClassic._disableInitializers";\n  "DisputeKitClassic.initialize";\n  "DisputeKitClassic.__DisputeKitClassicBase_initialize";\n  "DisputeKitClassicBase.onlyByOwner";\n  "DisputeKitClassicBase.OwnerOnly";\n  "DisputeKitClassicBase.onlyByCore";\n  "DisputeKitClassicBase.address";\n  "DisputeKitClassicBase.KlerosCoreOnly";\n  "DisputeKitClassicBase.notJumped";\n  "DisputeKitClassicBase.DisputeJumpedToParentDK";\n  "DisputeKitClassicBase.executeOwnerProposal";\n  "DisputeKitClassicBase.UnsuccessfulCall";\n  "KlerosCore.getNumberOfRounds";\n  "KlerosCore.sortitionModule";\n  "KlerosCore.disputes";\n  "ISortitionModule.draw";\n  "DisputeKitClassicBase._postDrawCheck";\n  "DisputeKitClassicBase.castCommit";\n  "DisputeKitClassicBase._castCommit";\n  "DisputeKitClassicBase.NotCommitPeriod";\n  "DisputeKitClassicBase.EmptyCommit";\n  "DisputeKitClassicBase.NotActiveForCoreDisputeID";\n  "DisputeKitClassicBase.JurorHasToOwnTheVote";\n  "DisputeKitClassicBase.castVote";\n  "DisputeKitClassicBase._castVote";\n  "DisputeKitClassicBase.NotVotePeriod";\n  "DisputeKitClassicBase.EmptyVoteIDs";\n  "DisputeKitClassicBase.ChoiceOutOfBounds";\n  "DisputeKitClassicBase.hashVote";\n  "DisputeKitClassicBase._getExpectedVoteHash";\n  "DisputeKitClassicBase.HashDoesNotMatchHiddenVoteCommitment";\n  "DisputeKitClassicBase.VoteAlreadyCast";\n  "DisputeKitClassicBase.fundAppeal";\n  "KlerosCore.appealPeriod";\n  "DisputeKitClassicBase.AppealPeriodIsOver";\n  "DisputeKitClassicBase.AppealPeriodIsOverForLoser";\n  "DisputeKitClassicBase.AppealFeeIsAlreadyPaid";\n  "KlerosCore.getNumberOfVotes";\n  "DisputeKitClassicBase.payable";\n  "DisputeKitClassicBase.withdrawFeesAndRewards";\n  "DisputeKitClassicBase.DisputeNotResolved";\n  "KlerosCore.paused";\n  "DisputeKitClassicBase.CoreIsPaused";\n  "_beneficiary.safeSend";\n  "DisputeKitClassicBase.getFundedChoices";\n  "DisputeKitClassicBase._getDegreeOfCoherence";\n  "DisputeKitClassicBase.areVotesAllCast";\n  "DisputeKitClassicBase.isAppealFunded";\n  "DisputeKitGated.<Constructor>";\n  "DisputeKitGated._disableInitializers";\n  "DisputeKitGated.initialize";\n  "DisputeKitGated.__DisputeKitClassicBase_initialize";\n  "DisputeKitGated.extraDataToTokenInfo";\n  "DisputeKitGatedShutter.<Constructor>";\n  "DisputeKitGatedShutter._disableInitializers";\n  "DisputeKitGatedShutter.initialize";\n  "DisputeKitGatedShutter.__DisputeKitClassicBase_initialize";\n  "DisputeKitGatedShutter.castCommitShutter";\n  "DisputeKitGatedShutter.EmptyRecoveryCommit";\n  "DisputeKitGatedShutter.castVoteShutter";\n  "DisputeKitGatedShutter._extraDataToTokenInfo";\n  "DisputeKitShutter.<Constructor>";\n  "DisputeKitShutter._disableInitializers";\n  "DisputeKitShutter.initialize";\n  "DisputeKitShutter.__DisputeKitClassicBase_initialize";\n  "DisputeKitShutter.castCommitShutter";\n  "DisputeKitShutter.EmptyRecoveryCommit";\n  "DisputeKitShutter.castVoteShutter";\n  "DisputeKitSybilResistant.<Constructor>";\n  "DisputeKitSybilResistant._disableInitializers";\n  "DisputeKitSybilResistant.initialize";\n  "DisputeKitSybilResistant.__DisputeKitClassicBase_initialize";\n  "IProofOfHumanity.isRegistered";\n  "EvidenceModule.onlyByOwner";\n  "EvidenceModule.OwnerOnly";\n  "EvidenceModule.<Constructor>";\n  "EvidenceModule._disableInitializers";\n  "SafeERC20.increaseAllowance";\n  "IERC20.approve";\n  "IERC20.allowance";\n  "SafeERC20.address";\n  "SafeERC20.safeTransfer";\n  "IERC20.UTION: When used with inheritance, manual care";\n  "abi.encodeCall";\n  "SafeERC20.safeTransferFrom";\n  "IERC20.utomatically lock it when it is deployed:\n *\n * ```\n * //";\n  "SafeSend.safeSend";\n  "_to.send";\n  "RNGWithFallback.<Constructor>";\n  "RNGWithFallback.address";\n  "RNGWithFallback.InvalidDefaultRNG";\n  "RNGWithFallback.onlyByOwner";\n  "RNGWithFallback.OwnerOnly";\n  "RNGWithFallback.onlyByConsumer";\n  "RNGWithFallback.ConsumerOnly";\n  "RNGWithFallback.blockhash";\n  "ChainlinkRNG.onlyByOwner";\n  "ChainlinkRNG.OwnerOnly";\n  "ChainlinkRNG.onlyByConsumer";\n  "ChainlinkRNG.ConsumerOnly";\n  "ChainlinkRNG.changeVrfCoordinator";\n  "ChainlinkRNG.IVRFCoordinatorV2Plus";\n  "ChainlinkRNG.CoordinatorSet";\n  "s_vrfCoordinator.requestRandomWords";\n  "VRFV2PlusClient.RandomWordsRequest";\n  "VRFV2PlusClient._argsToBytes";\n  "VRFV2PlusClient.ExtraArgsV1";\n  "UUPSProxiable.upgradeToAndCall";\n  "UUPSProxiable._authorizeUpgrade";\n  "UUPSProxiable.address";\n  "UUPSProxiable._getImplementation";\n  "UUPSProxiable.UUPSUnauthorizedCallContext";\n  "UUPSProxiable.UUPSUnsupportedProxiableUUID";\n  "newImplementation.delegatecall";\n  "UUPSProxiable.FailedDelegateCall";\n  "UUPSProxiable.InvalidImplementation";\n  "UUPSProxiable.proxiableUUID";\n  "UUPSProxy.<Constructor>";\n  "_implementation.delegatecall";\n  "UUPSProxy.<Fallback>";\n  "UUPSProxy._delegate";\n  "UUPSProxy._getImplementation";\n  "UUPSProxy.<Receive Ether>";\n  "Initializable.initializer";\n  "Initializable._getInitializableStorage";\n  "Initializable.address";\n  "Initializable.AlreadyInitialized";\n  "Initializable.reinitializer";\n  "Initializable.onlyInitializing";\n  "Initializable._checkInitializing";\n  "Initializable._isInitializing";\n  "Initializable.NotInitializing";\n  "Initializable._disableInitializers";\n  "Initializable.type";\n  "Initializable._getInitializedVersion";\n  "KlerosCore.onlyByOwner" -> "KlerosCore.OwnerOnly" [ color = "red" ];\n  "KlerosCore.onlyByGuardianOrOwner" -> "KlerosCore.GuardianOrOwnerOnly" [ color = "red" ];\n  "KlerosCore.whenPaused" -> "KlerosCore.WhenPausedOnly" [ color = "red" ];\n  "KlerosCore.whenNotPaused" -> "KlerosCore.WhenNotPausedOnly" [ color = "red" ];\n  "KlerosCore.<Constructor>" -> "KlerosCore._disableInitializers" [ color = "green" ];\n  "KlerosCore.initialize" -> "ISortitionModule.createTree" [ color = "orange" ];\n  "KlerosCore.initialize" -> "ISortitionModule.createTree" [ color = "orange" ];\n  "KlerosCore.initialize" -> "KlerosCore._enableDisputeKit" [ color = "green" ];\n  "KlerosCore.executeOwnerProposal" -> "KlerosCore.UnsuccessfulCall" [ color = "red" ];\n  "KlerosCore.createCourt" -> "KlerosCore.MinStakeLowerThanParentCourt" [ color = "red" ];\n  "KlerosCore.createCourt" -> "KlerosCore.UnsupportedDisputeKit" [ color = "red" ];\n  "KlerosCore.createCourt" -> "KlerosCore.InvalidForkingCourtAsParent" [ color = "red" ];\n  "KlerosCore.createCourt" -> "KlerosCore.WrongDisputeKitIndex" [ color = "red" ];\n  "KlerosCore.createCourt" -> "KlerosCore._enableDisputeKit" [ color = "green" ];\n  "KlerosCore.createCourt" -> "KlerosCore.MustSupportDisputeKitClassic" [ color = "red" ];\n  "KlerosCore.createCourt" -> "ISortitionModule.createTree" [ color = "orange" ];\n  "KlerosCore.changeCourtParameters" -> "KlerosCore.MinStakeLowerThanParentCourt" [ color = "red" ];\n  "KlerosCore.changeCourtParameters" -> "KlerosCore.MinStakeLowerThanParentCourt" [ color = "red" ];\n  "KlerosCore.enableDisputeKits" -> "KlerosCore.WrongDisputeKitIndex" [ color = "red" ];\n  "KlerosCore.enableDisputeKits" -> "KlerosCore._enableDisputeKit" [ color = "green" ];\n  "KlerosCore.enableDisputeKits" -> "KlerosCore.CannotDisableClassicDK" [ color = "red" ];\n  "KlerosCore.enableDisputeKits" -> "KlerosCore._enableDisputeKit" [ color = "green" ];\n  "KlerosCore.setStake" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.setStake" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.setStake" -> "IERC721.balanceOf" [ color = "orange" ];\n  "KlerosCore.setStake" -> "KlerosCore.NotEligibleForStaking" [ color = "red" ];\n  "KlerosCore.setStake" -> "KlerosCore._setStake" [ color = "green" ];\n  "KlerosCore.setStakeBySortitionModule" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.setStakeBySortitionModule" -> "KlerosCore.SortitionModuleOnly" [ color = "red" ];\n  "KlerosCore.setStakeBySortitionModule" -> "KlerosCore._setStake" [ color = "green" ];\n  "KlerosCore.transferBySortitionModule" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.transferBySortitionModule" -> "KlerosCore.SortitionModuleOnly" [ color = "red" ];\n  "KlerosCore.transferBySortitionModule" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCore.createDispute" -> "KlerosCore.arbitrationCost" [ color = "green" ];\n  "KlerosCore.createDispute" -> "KlerosCore.ArbitrationFeesNotEnough" [ color = "red" ];\n  "KlerosCore.createDispute" -> "KlerosCore._createDispute" [ color = "green" ];\n  "KlerosCore.createDispute" -> "KlerosCore.TokenNotAccepted" [ color = "red" ];\n  "KlerosCore.createDispute" -> "KlerosCore.arbitrationCost" [ color = "green" ];\n  "KlerosCore.createDispute" -> "KlerosCore.ArbitrationFeesNotEnough" [ color = "red" ];\n  "KlerosCore.createDispute" -> "IERC20.safeTransferFrom" [ color = "orange" ];\n  "KlerosCore.createDispute" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.createDispute" -> "KlerosCore.TransferFailed" [ color = "red" ];\n  "KlerosCore.createDispute" -> "KlerosCore._createDispute" [ color = "green" ];\n  "KlerosCore._createDispute" -> "KlerosCore.ArbitrableNotWhitelisted" [ color = "red" ];\n  "KlerosCore._createDispute" -> "KlerosCore._extraDataToCourtIDMinJurorsDisputeKit" [ color = "green" ];\n  "KlerosCore._createDispute" -> "KlerosCore.DisputeKitNotSupportedByCourt" [ color = "red" ];\n  "KlerosCore._createDispute" -> "KlerosCore.convertEthToTokenAmount" [ color = "green" ];\n  "KlerosCore._createDispute" -> "KlerosCore._calculatePnkAtStake" [ color = "green" ];\n  "KlerosCore._createDispute" -> "KlerosCore.IERC20" [ color = "green" ];\n  "KlerosCore._createDispute" -> "ISortitionModule.createDisputeHook" [ color = "orange" ];\n  "KlerosCore._createDispute" -> "IDisputeKit.createDispute" [ color = "orange" ];\n  "KlerosCore.passPeriod" -> "KlerosCore.EvidenceNotPassedAndNotAppeal" [ color = "red" ];\n  "KlerosCore.passPeriod" -> "KlerosCore.DisputeStillDrawing" [ color = "red" ];\n  "KlerosCore.passPeriod" -> "KlerosCore.CommitPeriodNotPassed" [ color = "red" ];\n  "KlerosCore.passPeriod" -> "KlerosCore.VotePeriodNotPassed" [ color = "red" ];\n  "KlerosCore.passPeriod" -> "KlerosCore.AppealPeriodNotPassed" [ color = "red" ];\n  "KlerosCore.passPeriod" -> "KlerosCore.DisputePeriodIsFinal" [ color = "red" ];\n  "KlerosCore.draw" -> "KlerosCore.NotEvidencePeriod" [ color = "red" ];\n  "KlerosCore.draw" -> "IDisputeKit.draw" [ color = "orange" ];\n  "KlerosCore.draw" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.draw" -> "ISortitionModule.lockStake" [ color = "orange" ];\n  "KlerosCore.draw" -> "ISortitionModule.postDrawHook" [ color = "orange" ];\n  "KlerosCore.appeal" -> "KlerosCore.appealCost" [ color = "green" ];\n  "KlerosCore.appeal" -> "KlerosCore.AppealFeesNotEnough" [ color = "red" ];\n  "KlerosCore.appeal" -> "KlerosCore.DisputeNotAppealable" [ color = "red" ];\n  "KlerosCore.appeal" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore.appeal" -> "KlerosCore.DisputeKitOnly" [ color = "red" ];\n  "KlerosCore.appeal" -> "KlerosCore._getCourtAndDisputeKitJumps" [ color = "green" ];\n  "KlerosCore.appeal" -> "KlerosCore._calculatePnkAtStake" [ color = "green" ];\n  "KlerosCore.appeal" -> "ISortitionModule.createDisputeHook" [ color = "orange" ];\n  "KlerosCore.execute" -> "KlerosCore.NotExecutionPeriod" [ color = "red" ];\n  "KlerosCore.execute" -> "IDisputeKit.getCoherentCount" [ color = "orange" ];\n  "KlerosCore.execute" -> "KlerosCore._executePenalties" [ color = "green" ];\n  "KlerosCore.execute" -> "KlerosCore._executeRewards" [ color = "green" ];\n  "KlerosCore._executePenalties" -> "IDisputeKit.getDegreeOfCoherencePenalty" [ color = "orange" ];\n  "KlerosCore._executePenalties" -> "ISortitionModule.unlockStake" [ color = "orange" ];\n  "KlerosCore._executePenalties" -> "ISortitionModule.setStakePenalty" [ color = "orange" ];\n  "KlerosCore._executePenalties" -> "IDisputeKit.isVoteActive" [ color = "orange" ];\n  "KlerosCore._executePenalties" -> "ISortitionModule.forcedUnstakeAllCourts" [ color = "orange" ];\n  "KlerosCore._executePenalties" -> "ISortitionModule.forcedUnstake" [ color = "orange" ];\n  "KlerosCore._executePenalties" -> "KlerosCore._transferFeeToken" [ color = "green" ];\n  "KlerosCore._executePenalties" -> "KlerosCore.payable" [ color = "green" ];\n  "KlerosCore._executePenalties" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCore._executeRewards" -> "IDisputeKit.getDegreeOfCoherenceReward" [ color = "orange" ];\n  "KlerosCore._executeRewards" -> "KlerosCore._applyCoherence" [ color = "green" ];\n  "KlerosCore._executeRewards" -> "ISortitionModule.unlockStake" [ color = "orange" ];\n  "KlerosCore._executeRewards" -> "KlerosCore._applyCoherence" [ color = "green" ];\n  "KlerosCore._executeRewards" -> "KlerosCore._applyCoherence" [ color = "green" ];\n  "KlerosCore._executeRewards" -> "KlerosCore._transferFeeToken" [ color = "green" ];\n  "KlerosCore._executeRewards" -> "KlerosCore.payable" [ color = "green" ];\n  "KlerosCore._executeRewards" -> "ISortitionModule.setStakeReward" [ color = "orange" ];\n  "KlerosCore._executeRewards" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCore._executeRewards" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCore._executeRewards" -> "KlerosCore._transferFeeToken" [ color = "green" ];\n  "KlerosCore._executeRewards" -> "KlerosCore.payable" [ color = "green" ];\n  "KlerosCore.executeRuling" -> "KlerosCore.NotExecutionPeriod" [ color = "red" ];\n  "KlerosCore.executeRuling" -> "KlerosCore.RulingAlreadyExecuted" [ color = "red" ];\n  "KlerosCore.executeRuling" -> "KlerosCore.currentRuling" [ color = "green" ];\n  "KlerosCore.arbitrationCost" -> "KlerosCore._extraDataToCourtIDMinJurorsDisputeKit" [ color = "green" ];\n  "KlerosCore.arbitrationCost" -> "KlerosCore.convertEthToTokenAmount" [ color = "green" ];\n  "KlerosCore.arbitrationCost" -> "KlerosCore.arbitrationCost" [ color = "green" ];\n  "KlerosCore.appealCost" -> "KlerosCore._getCourtAndDisputeKitJumps" [ color = "green" ];\n  "KlerosCore.currentRuling" -> "IDisputeKit.currentRuling" [ color = "orange" ];\n  "KlerosCore.isDisputeKitJumping" -> "KlerosCore._isCourtJumping" [ color = "green" ];\n  "KlerosCore._getCourtAndDisputeKitJumps" -> "KlerosCore._isCourtJumping" [ color = "green" ];\n  "KlerosCore._transferFeeToken" -> "_recipient.safeSend" [ color = "orange" ];\n  "KlerosCore._transferFeeToken" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCore._setStake" -> "KlerosCore._stakingFailed" [ color = "green" ];\n  "KlerosCore._setStake" -> "KlerosCore._stakingFailed" [ color = "green" ];\n  "KlerosCore._setStake" -> "ISortitionModule.validateStake" [ color = "orange" ];\n  "KlerosCore._setStake" -> "KlerosCore._stakingFailed" [ color = "green" ];\n  "KlerosCore._setStake" -> "IERC20.safeTransferFrom" [ color = "orange" ];\n  "KlerosCore._setStake" -> "KlerosCore.address" [ color = "green" ];\n  "KlerosCore._setStake" -> "KlerosCore._stakingFailed" [ color = "green" ];\n  "KlerosCore._setStake" -> "IERC20.safeTransfer" [ color = "orange" ];\n  "KlerosCore._setStake" -> "KlerosCore._stakingFailed" [ color = "green" ];\n  "KlerosCore._setStake" -> "ISortitionModule.setStake" [ color = "orange" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingTransferFailed" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.UnstakingTransferFailed" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingInTooManyCourts" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingNotPossibleInThisCourt" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingLessThanCourtMinStake" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingZeroWhenNoStake" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingMoreThanMaxStakePerJuror" [ color = "red" ];\n  "KlerosCore._stakingFailed" -> "KlerosCore.StakingMoreThanMaxTotalStaked" [ color = "red" ];\n  "PolicyRegistry.onlyByOwner" -> "PolicyRegistry.OwnerOnly" [ color = "red" ];\n  "PolicyRegistry.<Constructor>" -> "PolicyRegistry._disableInitializers" [ color = "green" ];\n  "SortitionModule.<Constructor>" -> "SortitionModule._disableInitializers" [ color = "green" ];\n  "SortitionModule.onlyByOwner" -> "SortitionModule.OwnerOnly" [ color = "red" ];\n  "SortitionModule.onlyByCore" -> "SortitionModule.address" [ color = "green" ];\n  "SortitionModule.onlyByCore" -> "SortitionModule.KlerosCoreOnly" [ color = "red" ];\n  "SortitionModule.changeRandomNumberGenerator" -> "IRNG.requestRandomness" [ color = "orange" ];\n  "SortitionModule.passPhase" -> "SortitionModule.MinStakingTimeNotPassed" [ color = "red" ];\n  "SortitionModule.passPhase" -> "SortitionModule.NoDisputesThatNeedJurors" [ color = "red" ];\n  "SortitionModule.passPhase" -> "IRNG.requestRandomness" [ color = "orange" ];\n  "SortitionModule.passPhase" -> "IRNG.receiveRandomness" [ color = "orange" ];\n  "SortitionModule.passPhase" -> "SortitionModule.RandomNumberNotReady" [ color = "red" ];\n  "SortitionModule.passPhase" -> "SortitionModule.DisputesWithoutJurorsAndMaxDrawingTimeNotPassed" [ color = "red" ];\n  "ISortitionModule.createTree" -> "CourtID.wrap" [ color = "orange" ];\n  "ISortitionModule.createTree" -> "SortitionModule._extraDataToTreeK" [ color = "green" ];\n  "ISortitionModule.createTree" -> "sortitionSumTrees.createTree" [ color = "orange" ];\n  "SortitionModule.executeDelayedStakes" -> "SortitionModule.NotStakingPhase" [ color = "red" ];\n  "SortitionModule.executeDelayedStakes" -> "SortitionModule.NoDelayedStakeToExecute" [ color = "red" ];\n  "SortitionModule.executeDelayedStakes" -> "KlerosCore.setStakeBySortitionModule" [ color = "orange" ];\n  "ISortitionModule.validateStake" -> "SortitionModule._validateStake" [ color = "green" ];\n  "SortitionModule._validateStake" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "ISortitionModule.setStake" -> "SortitionModule._setStake" [ color = "green" ];\n  "ISortitionModule.setStakePenalty" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "ISortitionModule.setStakePenalty" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "ISortitionModule.setStakePenalty" -> "SortitionModule._setStake" [ color = "green" ];\n  "ISortitionModule.setStakePenalty" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "ISortitionModule.setStakeReward" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "ISortitionModule.setStakeReward" -> "SortitionModule._setStake" [ color = "green" ];\n  "SortitionModule._setStake" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "SortitionModule._setStake" -> "SortitionTrees.toStakePathID" [ color = "orange" ];\n  "SortitionModule._setStake" -> "CourtID.wrap" [ color = "orange" ];\n  "SortitionModule._setStake" -> "KlerosCore.courts" [ color = "orange" ];\n  "ISortitionModule.unlockStake" -> "SortitionModule.getJurorLeftoverPNK" [ color = "green" ];\n  "ISortitionModule.forcedUnstakeAllCourts" -> "SortitionModule.getJurorCourtIDs" [ color = "green" ];\n  "ISortitionModule.forcedUnstakeAllCourts" -> "KlerosCore.setStakeBySortitionModule" [ color = "orange" ];\n  "ISortitionModule.forcedUnstake" -> "KlerosCore.setStakeBySortitionModule" [ color = "orange" ];\n  "SortitionModule.withdrawLeftoverPNK" -> "SortitionModule.getJurorLeftoverPNK" [ color = "green" ];\n  "SortitionModule.withdrawLeftoverPNK" -> "SortitionModule.NotEligibleForWithdrawal" [ color = "red" ];\n  "SortitionModule.withdrawLeftoverPNK" -> "KlerosCore.transferBySortitionModule" [ color = "orange" ];\n  "SortitionModule.draw" -> "SortitionModule.NotDrawingPhase" [ color = "red" ];\n  "SortitionModule.draw" -> "CourtID.wrap" [ color = "orange" ];\n  "SortitionModule.stakeOf" -> "SortitionTrees.toStakePathID" [ color = "orange" ];\n  "SortitionModule.stakeOf" -> "CourtID.wrap" [ color = "orange" ];\n  "SortitionModule.getJurorBalance" -> "SortitionModule.stakeOf" [ color = "green" ];\n  "DisputeResolver.changeOwner" -> "DisputeResolver.OwnerOnly" [ color = "red" ];\n  "DisputeResolver.changeArbitrator" -> "DisputeResolver.OwnerOnly" [ color = "red" ];\n  "DisputeResolver.changeTemplateRegistry" -> "DisputeResolver.OwnerOnly" [ color = "red" ];\n  "DisputeResolver.createDisputeForTemplate" -> "DisputeResolver._createDispute" [ color = "green" ];\n  "DisputeResolver.createDisputeForTemplateUri" -> "DisputeResolver._createDispute" [ color = "green" ];\n  "DisputeResolver.rule" -> "DisputeResolver.address" [ color = "green" ];\n  "DisputeResolver.rule" -> "DisputeResolver.ArbitratorOnly" [ color = "red" ];\n  "DisputeResolver.rule" -> "DisputeResolver.RulingOutOfBounds" [ color = "red" ];\n  "DisputeResolver.rule" -> "DisputeResolver.DisputeAlreadyRuled" [ color = "red" ];\n  "DisputeResolver._createDispute" -> "DisputeResolver.ShouldBeAtLeastTwoRulingOptions" [ color = "red" ];\n  "DisputeResolver._createDispute" -> "IDisputeTemplateRegistry.setDisputeTemplate" [ color = "orange" ];\n  "DisputeTemplateRegistry.onlyByOwner" -> "DisputeTemplateRegistry.OwnerOnly" [ color = "red" ];\n  "DisputeTemplateRegistry.<Constructor>" -> "DisputeTemplateRegistry._disableInitializers" [ color = "green" ];\n  "DisputeKitClassic.<Constructor>" -> "DisputeKitClassic._disableInitializers" [ color = "green" ];\n  "DisputeKitClassic.initialize" -> "DisputeKitClassic.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitClassicBase.onlyByOwner" -> "DisputeKitClassicBase.OwnerOnly" [ color = "red" ];\n  "DisputeKitClassicBase.onlyByCore" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase.onlyByCore" -> "DisputeKitClassicBase.KlerosCoreOnly" [ color = "red" ];\n  "DisputeKitClassicBase.notJumped" -> "DisputeKitClassicBase.DisputeJumpedToParentDK" [ color = "red" ];\n  "DisputeKitClassicBase.executeOwnerProposal" -> "DisputeKitClassicBase.UnsuccessfulCall" [ color = "red" ];\n  "IDisputeKit.createDispute" -> "KlerosCore.getNumberOfRounds" [ color = "orange" ];\n  "IDisputeKit.draw" -> "KlerosCore.sortitionModule" [ color = "orange" ];\n  "IDisputeKit.draw" -> "KlerosCore.disputes" [ color = "orange" ];\n  "IDisputeKit.draw" -> "ISortitionModule.draw" [ color = "orange" ];\n  "IDisputeKit.draw" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "IDisputeKit.draw" -> "DisputeKitClassicBase._postDrawCheck" [ color = "green" ];\n  "IDisputeKit.draw" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase.castCommit" -> "DisputeKitClassicBase._castCommit" [ color = "green" ];\n  "DisputeKitClassicBase._castCommit" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase._castCommit" -> "DisputeKitClassicBase.NotCommitPeriod" [ color = "red" ];\n  "DisputeKitClassicBase._castCommit" -> "DisputeKitClassicBase.EmptyCommit" [ color = "red" ];\n  "DisputeKitClassicBase._castCommit" -> "DisputeKitClassicBase.NotActiveForCoreDisputeID" [ color = "red" ];\n  "DisputeKitClassicBase._castCommit" -> "DisputeKitClassicBase.JurorHasToOwnTheVote" [ color = "red" ];\n  "DisputeKitClassicBase.castVote" -> "DisputeKitClassicBase._castVote" [ color = "green" ];\n  "DisputeKitClassicBase._castVote" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.NotVotePeriod" [ color = "red" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.EmptyVoteIDs" [ color = "red" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.NotActiveForCoreDisputeID" [ color = "red" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.ChoiceOutOfBounds" [ color = "red" ];\n  "DisputeKitClassicBase._castVote" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase._castVote" -> "KlerosCore.courts" [ color = "orange" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.hashVote" [ color = "green" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.JurorHasToOwnTheVote" [ color = "red" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase._getExpectedVoteHash" [ color = "green" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.HashDoesNotMatchHiddenVoteCommitment" [ color = "red" ];\n  "DisputeKitClassicBase._castVote" -> "DisputeKitClassicBase.VoteAlreadyCast" [ color = "red" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.ChoiceOutOfBounds" [ color = "red" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.NotActiveForCoreDisputeID" [ color = "red" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.appealPeriod" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.AppealPeriodIsOver" [ color = "red" ];\n  "DisputeKitClassicBase.fundAppeal" -> "IDisputeKit.currentRuling" [ color = "green" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.AppealPeriodIsOverForLoser" [ color = "red" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.getNumberOfRounds" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.AppealFeeIsAlreadyPaid" [ color = "red" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.appealCost" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.isDisputeKitJumping" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "KlerosCore.getNumberOfVotes" [ color = "orange" ];\n  "DisputeKitClassicBase.fundAppeal" -> "DisputeKitClassicBase.payable" [ color = "green" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "DisputeKitClassicBase.DisputeNotResolved" [ color = "red" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "KlerosCore.paused" [ color = "orange" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "DisputeKitClassicBase.CoreIsPaused" [ color = "red" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "DisputeKitClassicBase.NotActiveForCoreDisputeID" [ color = "red" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "KlerosCore.currentRuling" [ color = "orange" ];\n  "DisputeKitClassicBase.withdrawFeesAndRewards" -> "_beneficiary.safeSend" [ color = "orange" ];\n  "IDisputeKit.currentRuling" -> "KlerosCore.disputes" [ color = "orange" ];\n  "IDisputeKit.currentRuling" -> "DisputeKitClassicBase.getFundedChoices" [ color = "green" ];\n  "IDisputeKit.getDegreeOfCoherenceReward" -> "DisputeKitClassicBase._getDegreeOfCoherence" [ color = "green" ];\n  "IDisputeKit.getDegreeOfCoherencePenalty" -> "DisputeKitClassicBase._getDegreeOfCoherence" [ color = "green" ];\n  "DisputeKitClassicBase._getDegreeOfCoherence" -> "KlerosCore.currentRuling" [ color = "orange" ];\n  "IDisputeKit.getCoherentCount" -> "KlerosCore.currentRuling" [ color = "orange" ];\n  "DisputeKitClassicBase.areVotesAllCast" -> "KlerosCore.disputes" [ color = "orange" ];\n  "DisputeKitClassicBase.areVotesAllCast" -> "KlerosCore.courts" [ color = "orange" ];\n  "DisputeKitClassicBase.isAppealFunded" -> "KlerosCore.appealPeriod" [ color = "orange" ];\n  "DisputeKitClassicBase.isAppealFunded" -> "DisputeKitClassicBase.getFundedChoices" [ color = "green" ];\n  "DisputeKitGated.<Constructor>" -> "DisputeKitGated._disableInitializers" [ color = "green" ];\n  "DisputeKitGated.initialize" -> "DisputeKitGated.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitGated.extraDataToTokenInfo" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase._postDrawCheck" [ color = "orange" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitGated.extraDataToTokenInfo" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitGatedShutter.<Constructor>" -> "DisputeKitGatedShutter._disableInitializers" [ color = "green" ];\n  "DisputeKitGatedShutter.initialize" -> "DisputeKitGatedShutter.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitGatedShutter.castCommitShutter" -> "DisputeKitGatedShutter.EmptyRecoveryCommit" [ color = "red" ];\n  "DisputeKitGatedShutter.castCommitShutter" -> "DisputeKitClassicBase._castCommit" [ color = "green" ];\n  "DisputeKitGatedShutter.castVoteShutter" -> "DisputeKitClassicBase._castVote" [ color = "green" ];\n  "DisputeKitGatedShutter._extraDataToTokenInfo" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase._postDrawCheck" [ color = "orange" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitGatedShutter._extraDataToTokenInfo" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase.address" [ color = "green" ];\n  "DisputeKitShutter.<Constructor>" -> "DisputeKitShutter._disableInitializers" [ color = "green" ];\n  "DisputeKitShutter.initialize" -> "DisputeKitShutter.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitShutter.castCommitShutter" -> "DisputeKitShutter.EmptyRecoveryCommit" [ color = "red" ];\n  "DisputeKitShutter.castCommitShutter" -> "DisputeKitClassicBase._castCommit" [ color = "green" ];\n  "DisputeKitShutter.castVoteShutter" -> "DisputeKitClassicBase._castVote" [ color = "green" ];\n  "DisputeKitSybilResistant.<Constructor>" -> "DisputeKitSybilResistant._disableInitializers" [ color = "green" ];\n  "DisputeKitSybilResistant.initialize" -> "DisputeKitSybilResistant.__DisputeKitClassicBase_initialize" [ color = "green" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "DisputeKitClassicBase._postDrawCheck" [ color = "orange" ];\n  "DisputeKitClassicBase._postDrawCheck" -> "IProofOfHumanity.isRegistered" [ color = "orange" ];\n  "EvidenceModule.onlyByOwner" -> "EvidenceModule.OwnerOnly" [ color = "red" ];\n  "EvidenceModule.<Constructor>" -> "EvidenceModule._disableInitializers" [ color = "green" ];\n  "SafeERC20.increaseAllowance" -> "IERC20.approve" [ color = "orange" ];\n  "SafeERC20.increaseAllowance" -> "IERC20.allowance" [ color = "orange" ];\n  "SafeERC20.increaseAllowance" -> "SafeERC20.address" [ color = "green" ];\n  "SafeERC20.safeTransfer" -> "IERC20.UTION: When used with inheritance, manual care" [ color = "orange" ];\n  "SafeERC20.safeTransfer" -> "SafeERC20.address" [ color = "green" ];\n  "SafeERC20.safeTransfer" -> "abi.encodeCall" [ color = "orange" ];\n  "SafeERC20.safeTransferFrom" -> "IERC20.utomatically lock it when it is deployed:\n *\n * ```\n * //" [ color = "orange" ];\n  "SafeERC20.safeTransferFrom" -> "SafeERC20.address" [ color = "green" ];\n  "SafeERC20.safeTransferFrom" -> "abi.encodeCall" [ color = "orange" ];\n  "SafeSend.safeSend" -> "_to.send" [ color = "orange" ];\n  "RNGWithFallback.<Constructor>" -> "RNGWithFallback.address" [ color = "green" ];\n  "RNGWithFallback.<Constructor>" -> "RNGWithFallback.address" [ color = "green" ];\n  "RNGWithFallback.<Constructor>" -> "RNGWithFallback.InvalidDefaultRNG" [ color = "red" ];\n  "RNGWithFallback.onlyByOwner" -> "RNGWithFallback.OwnerOnly" [ color = "red" ];\n  "RNGWithFallback.onlyByConsumer" -> "RNGWithFallback.ConsumerOnly" [ color = "red" ];\n  "IRNG.requestRandomness" -> "IRNG.requestRandomness" [ color = "orange" ];\n  "IRNG.receiveRandomness" -> "IRNG.receiveRandomness" [ color = "orange" ];\n  "IRNG.receiveRandomness" -> "RNGWithFallback.blockhash" [ color = "green" ];\n  "ChainlinkRNG.onlyByOwner" -> "ChainlinkRNG.OwnerOnly" [ color = "red" ];\n  "ChainlinkRNG.onlyByConsumer" -> "ChainlinkRNG.ConsumerOnly" [ color = "red" ];\n  "ChainlinkRNG.changeVrfCoordinator" -> "ChainlinkRNG.IVRFCoordinatorV2Plus" [ color = "green" ];\n  "ChainlinkRNG.changeVrfCoordinator" -> "ChainlinkRNG.CoordinatorSet" [ color = "green" ];\n  "IRNG.requestRandomness" -> "s_vrfCoordinator.requestRandomWords" [ color = "orange" ];\n  "IRNG.requestRandomness" -> "VRFV2PlusClient.RandomWordsRequest" [ color = "orange" ];\n  "IRNG.requestRandomness" -> "VRFV2PlusClient._argsToBytes" [ color = "orange" ];\n  "IRNG.requestRandomness" -> "VRFV2PlusClient.ExtraArgsV1" [ color = "orange" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable._authorizeUpgrade" [ color = "green" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.address" [ color = "green" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable._getImplementation" [ color = "green" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.UUPSUnauthorizedCallContext" [ color = "red" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.UUPSUnsupportedProxiableUUID" [ color = "red" ];\n  "UUPSProxiable.upgradeToAndCall" -> "newImplementation.delegatecall" [ color = "orange" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.FailedDelegateCall" [ color = "red" ];\n  "UUPSProxiable.upgradeToAndCall" -> "UUPSProxiable.InvalidImplementation" [ color = "red" ];\n  "UUPSProxiable.proxiableUUID" -> "UUPSProxiable.address" [ color = "green" ];\n  "UUPSProxiable.proxiableUUID" -> "UUPSProxiable.UUPSUnauthorizedCallContext" [ color = "red" ];\n  "UUPSProxy.<Constructor>" -> "_implementation.delegatecall" [ color = "orange" ];\n  "UUPSProxy.<Fallback>" -> "UUPSProxy._delegate" [ color = "green" ];\n  "UUPSProxy.<Fallback>" -> "UUPSProxy._getImplementation" [ color = "green" ];\n  "UUPSProxy.<Receive Ether>" -> "UUPSProxy._delegate" [ color = "green" ];\n  "UUPSProxy.<Receive Ether>" -> "UUPSProxy._getImplementation" [ color = "green" ];\n  "Initializable.initializer" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable.initializer" -> "Initializable.address" [ color = "green" ];\n  "Initializable.initializer" -> "Initializable.AlreadyInitialized" [ color = "red" ];\n  "Initializable.reinitializer" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable.reinitializer" -> "Initializable.AlreadyInitialized" [ color = "red" ];\n  "Initializable.onlyInitializing" -> "Initializable._checkInitializing" [ color = "green" ];\n  "Initializable._checkInitializing" -> "Initializable._isInitializing" [ color = "green" ];\n  "Initializable._checkInitializing" -> "Initializable.NotInitializing" [ color = "red" ];\n  "Initializable._disableInitializers" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable._disableInitializers" -> "Initializable.AlreadyInitialized" [ color = "red" ];\n  "Initializable._disableInitializers" -> "Initializable.type" [ color = "green" ];\n  "Initializable._disableInitializers" -> "Initializable.type" [ color = "green" ];\n  "Initializable._disableInitializers" -> "Initializable.type" [ color = "green" ];\n  "Initializable._getInitializedVersion" -> "Initializable._getInitializableStorage" [ color = "green" ];\n  "Initializable._isInitializing" -> "Initializable._getInitializableStorage" [ color = "green" ];\n\n\nrankdir=LR\nnode [shape=plaintext]\nsubgraph cluster_01 { \nlabel = "Legend";\nkey [label=<<table border="0" cellpadding="2" cellspacing="0" cellborder="0">\n  <tr><td align="right" port="i1">Internal Call</td></tr>\n  <tr><td align="right" port="i2">External Call</td></tr>\n  <tr><td align="right" port="i2">Custom Error Call</td></tr>\n  <tr><td align="right" port="i3">Defined Contract</td></tr>\n  <tr><td align="right" port="i4">Undefined Contract</td></tr>\n  </table>>]\nkey2 [label=<<table border="0" cellpadding="2" cellspacing="0" cellborder="0">\n  <tr><td port="i1">&nbsp;&nbsp;&nbsp;</td></tr>\n  <tr><td port="i2">&nbsp;&nbsp;&nbsp;</td></tr>\n  <tr><td port="i3" bgcolor="lightgray">&nbsp;&nbsp;&nbsp;</td></tr>\n  <tr><td port="i4">\n    <table border="1" cellborder="0" cellspacing="0" cellpadding="7" color="lightgray">\n      <tr>\n       <td></td>\n      </tr>\n     </table>\n  </td></tr>\n  </table>>]\nkey:i1:e -> key2:i1:w [color="green"]\nkey:i2:e -> key2:i2:w [color="orange"]\nkey:i2:e -> key2:i2:w [color="red"]\n}\n}\n',
         },
       };
 
diff --git a/contracts/audit/METRICS.md b/contracts/audit/METRICS.md
index 1a1a40ea3..ae2620a40 100644
--- a/contracts/audit/METRICS.md
+++ b/contracts/audit/METRICS.md
@@ -42,43 +42,39 @@ This section lists files that are in scope for the metrics report.
 
 ### <span id=t-source-Units-in-Scope>Source Units in Scope</span>
 
-Source Units Analyzed: **`31`**<br>
-Source Units in Scope: **`31`** (**100%**)
+Source Units Analyzed: **`27`**<br>
+Source Units in Scope: **`27`** (**100%**)
 
 | Type     | File                                                      | Logic Contracts | Interfaces | Lines    | nLines   | nSLOC    | Comment Lines | Complex. Score | Capabilities                                                                                                                                                                                                                                                                                     |
 | -------- | --------------------------------------------------------- | --------------- | ---------- | -------- | -------- | -------- | ------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| 📝       | src/arbitration/KlerosCore.sol                            | 1               | \*\*\*\*   | 75       | 63       | 28       | 26            | 13             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 🎨       | src/arbitration/KlerosCoreBase.sol                        | 1               | \*\*\*\*   | 1211     | 1162     | 809      | 286           | 449            | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Payable Functions'>💰</abbr>**                                                                                                                                                                                                               |
-| 📝       | src/arbitration/KlerosCoreNeo.sol                         | 1               | \*\*\*\*   | 142      | 124      | 55       | 51            | 36             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 📝       | src/arbitration/PolicyRegistry.sol                        | 1               | \*\*\*\*   | 88       | 88       | 30       | 41            | 24             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 📝       | src/arbitration/SortitionModule.sol                       | 1               | \*\*\*\*   | 50       | 44       | 15       | 20            | 13             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 🎨       | src/arbitration/SortitionModuleBase.sol                   | 1               | \*\*\*\*   | 689      | 645      | 393      | 205           | 300            | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Uses Hash-Functions'>🧮</abbr>**                                                                                                                                                                                                             |
-| 📝       | src/arbitration/SortitionModuleNeo.sol                    | 1               | \*\*\*\*   | 103      | 91       | 48       | 28            | 31             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 📝       | src/arbitration/arbitrables/DisputeResolver.sol           | 1               | \*\*\*\*   | 149      | 134      | 72       | 50            | 43             | **<abbr title='Payable Functions'>💰</abbr>**                                                                                                                                                                                                                                                    |
-| 📝       | src/arbitration/DisputeTemplateRegistry.sol               | 1               | \*\*\*\*   | 83       | 79       | 30       | 33            | 25             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 📝       | src/arbitration/dispute-kits/DisputeKitClassic.sol        | 1               | \*\*\*\*   | 46       | 46       | 16       | 21            | 13             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 🎨       | src/arbitration/dispute-kits/DisputeKitClassicBase.sol    | 1               | \*\*\*\*   | 713      | 632      | 365      | 225           | 192            | **<abbr title='Payable Functions'>💰</abbr><abbr title='Uses Hash-Functions'>🧮</abbr>**                                                                                                                                                                                                         |
-| 📝🔍     | src/arbitration/dispute-kits/DisputeKitGated.sol          | 1               | 2          | 117      | 99       | 39       | 51            | 57             | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='doppelganger(IBalanceHolderERC1155)'>🔆</abbr>**                                                                                                                                                                                             |
-| 📝🔍     | src/arbitration/dispute-kits/DisputeKitGatedShutter.sol   | 1               | 2          | 194      | 159      | 59       | 84            | 69             | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Uses Hash-Functions'>🧮</abbr><abbr title='doppelganger(IBalanceHolderERC1155)'>🔆</abbr>**                                                                                                                                                  |
-| 📝       | src/arbitration/dispute-kits/DisputeKitShutter.sol        | 1               | \*\*\*\*   | 123      | 107      | 36       | 54            | 27             | **<abbr title='Uses Hash-Functions'>🧮</abbr>**                                                                                                                                                                                                                                                  |
-| 📝🔍     | src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 1               | 1          | 76       | 58       | 20       | 33            | 16             | **<abbr title='doppelganger(IProofOfHumanity)'>🔆</abbr>**                                                                                                                                                                                                                                       |
-| 📝       | src/arbitration/evidence/EvidenceModule.sol               | 1               | \*\*\*\*   | 70       | 70       | 26       | 30            | 21             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 📝       | src/arbitration/KlerosCore.sol                            | 1               | \*\*\*\*   | 1333     | 1272     | 869      | 322           | 486            | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Payable Functions'>💰</abbr>**                                                                                                                                                                                                               |
+| 📝       | src/arbitration/PolicyRegistry.sol                        | 1               | \*\*\*\*   | 90       | 90       | 29       | 43            | 22             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 📝       | src/arbitration/SortitionModule.sol                       | 1               | \*\*\*\*   | 622      | 572      | 325      | 208           | 223            | **<abbr title='Uses Assembly'>🖥</abbr>**                                                                                                                                                                                                                                                        |
+| 📝       | src/arbitration/arbitrables/DisputeResolver.sol           | 1               | \*\*\*\*   | 159      | 144      | 77       | 53            | 50             | **<abbr title='Payable Functions'>💰</abbr>**                                                                                                                                                                                                                                                    |
+| 📝       | src/arbitration/DisputeTemplateRegistry.sol               | 1               | \*\*\*\*   | 85       | 81       | 29       | 35            | 23             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 📝       | src/arbitration/dispute-kits/DisputeKitClassic.sol        | 1               | \*\*\*\*   | 48       | 43       | 13       | 22            | 10             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 🎨       | src/arbitration/dispute-kits/DisputeKitClassicBase.sol    | 1               | \*\*\*\*   | 800      | 705      | 407      | 253           | 228            | **<abbr title='Payable Functions'>💰</abbr><abbr title='Uses Hash-Functions'>🧮</abbr>**                                                                                                                                                                                                         |
+| 📝🔍     | src/arbitration/dispute-kits/DisputeKitGated.sol          | 1               | 2          | 119      | 96       | 36       | 52            | 54             | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='doppelganger(IBalanceHolderERC1155)'>🔆</abbr>**                                                                                                                                                                                             |
+| 📝🔍     | src/arbitration/dispute-kits/DisputeKitGatedShutter.sol   | 1               | 2          | 256      | 211      | 81       | 104           | 80             | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Uses Hash-Functions'>🧮</abbr><abbr title='doppelganger(IBalanceHolderERC1155)'>🔆</abbr>**                                                                                                                                                  |
+| 📝       | src/arbitration/dispute-kits/DisputeKitShutter.sol        | 1               | \*\*\*\*   | 189      | 163      | 58       | 77            | 38             | **<abbr title='Uses Hash-Functions'>🧮</abbr>**                                                                                                                                                                                                                                                  |
+| 📝🔍     | src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 1               | 1          | 78       | 59       | 20       | 34            | 16             | **<abbr title='doppelganger(IProofOfHumanity)'>🔆</abbr>**                                                                                                                                                                                                                                       |
+| 📝       | src/arbitration/evidence/EvidenceModule.sol               | 1               | \*\*\*\*   | 72       | 72       | 25       | 32            | 19             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 🔍       | src/arbitration/interfaces/IArbitrableV2.sol              | \*\*\*\*        | 1          | 40       | 39       | 12       | 22            | 3              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 🔍       | src/arbitration/interfaces/IArbitratorV2.sol              | \*\*\*\*        | 1          | 83       | 44       | 9        | 50            | 14             | **<abbr title='Payable Functions'>💰</abbr>**                                                                                                                                                                                                                                                    |
-| 🔍       | src/arbitration/interfaces/IDisputeKit.sol                | \*\*\*\*        | 1          | 128      | 39       | 11       | 60            | 23             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 🔍       | src/arbitration/interfaces/IDisputeKit.sol                | \*\*\*\*        | 1          | 165      | 39       | 11       | 78            | 31             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 🔍       | src/arbitration/interfaces/IDisputeTemplateRegistry.sol   | \*\*\*\*        | 1          | 25       | 20       | 9        | 8             | 3              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 🔍       | src/arbitration/interfaces/IEvidence.sol                  | \*\*\*\*        | 1          | 12       | 12       | 4        | 6             | 1              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 🔍       | src/arbitration/interfaces/ISortitionModule.sol           | \*\*\*\*        | 1          | 63       | 16       | 10       | 4             | 33             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-|          | src/libraries/Constants.sol                               | \*\*\*\*        | \*\*\*\*   | 39       | 39       | 26       | 13            | 2              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 🔍       | src/arbitration/interfaces/ISortitionModule.sol           | \*\*\*\*        | 1          | 73       | 16       | 10       | 4             | 37             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+|          | src/libraries/Constants.sol                               | \*\*\*\*        | \*\*\*\*   | 42       | 42       | 27       | 14            | 2              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 📚       | src/libraries/SafeERC20.sol                               | 1               | \*\*\*\*   | 47       | 47       | 18       | 24            | 12             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 📚🔍     | src/libraries/SafeSend.sol                                | 1               | 1          | 24       | 19       | 9        | 7             | 15             | **<abbr title='Payable Functions'>💰</abbr><abbr title='Initiates ETH Value Transfer'>📤</abbr>**                                                                                                                                                                                                |
-| 📝       | src/rng/RNGWithFallback.sol                               | 1               | \*\*\*\*   | 103      | 103      | 48       | 41            | 35             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 📝       | src/rng/ChainlinkRNG.sol                                  | 1               | \*\*\*\*   | 173      | 173      | 85       | 70            | 50             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
-| 🔍       | src/rng/IRNG.sol                                          | \*\*\*\*        | 1          | 13       | 8        | 3        | 5             | 5              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 📝       | src/rng/RNGWithFallback.sol                               | 1               | \*\*\*\*   | 109      | 109      | 49       | 44            | 38             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 📝       | src/rng/ChainlinkRNG.sol                                  | 1               | \*\*\*\*   | 171      | 171      | 83       | 69            | 51             | \*\*\*\*                                                                                                                                                                                                                                                                                         |
+| 🔍       | src/rng/IRNG.sol                                          | \*\*\*\*        | 1          | 16       | 8        | 3        | 5             | 5              | \*\*\*\*                                                                                                                                                                                                                                                                                         |
 | 🎨       | src/proxy/UUPSProxiable.sol                               | 1               | \*\*\*\*   | 140      | 122      | 44       | 71            | 46             | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Payable Functions'>💰</abbr><abbr title='DelegateCall'>👥</abbr><abbr title='TryCatch Blocks'>♻️</abbr>**                                                                                                                                    |
 | 📝       | src/proxy/UUPSProxy.sol                                   | 1               | \*\*\*\*   | 90       | 90       | 38       | 37            | 65             | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Payable Functions'>💰</abbr><abbr title='DelegateCall'>👥</abbr>**                                                                                                                                                                           |
 | 🎨       | src/proxy/Initializable.sol                               | 1               | \*\*\*\*   | 215      | 215      | 70       | 128           | 31             | **<abbr title='Uses Assembly'>🖥</abbr>**                                                                                                                                                                                                                                                        |
-| 📝📚🔍🎨 | **Totals**                                                | **23**          | **13**     | **5124** | **4587** | **2437** | **1784**      | **1667**       | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Payable Functions'>💰</abbr><abbr title='Initiates ETH Value Transfer'>📤</abbr><abbr title='DelegateCall'>👥</abbr><abbr title='Uses Hash-Functions'>🧮</abbr><abbr title='doppelganger'>🔆</abbr><abbr title='TryCatch Blocks'>♻️</abbr>** |
+| 📝📚🔍🎨 | **Totals**                                                | **19**          | **13**     | **5103** | **4501** | **2365** | **1802**      | **1603**       | **<abbr title='Uses Assembly'>🖥</abbr><abbr title='Payable Functions'>💰</abbr><abbr title='Initiates ETH Value Transfer'>📤</abbr><abbr title='DelegateCall'>👥</abbr><abbr title='Uses Hash-Functions'>🧮</abbr><abbr title='doppelganger'>🔆</abbr><abbr title='TryCatch Blocks'>♻️</abbr>** |
 
 <sub>
 Legend: <a onclick="toggleVisibility('table-legend', this)">[➕]</a>
@@ -97,18 +93,16 @@ Legend: <a onclick="toggleVisibility('table-legend', this)">[➕]</a>
 
 ##### <span id=t-deployable-contracts>Deployable Logic Contracts</span>
 
-Total: 16
+Total: 14
 
 - 📝 `KlerosCore`
-- 📝 `KlerosCoreNeo`
 - 📝 `PolicyRegistry`
 - 📝 `SortitionModule`
-- 📝 `SortitionModuleNeo`
+- 📝 `DisputeResolver`
+- 📝 `DisputeTemplateRegistry`
 - <a onclick="toggleVisibility('deployables', this)">[➕]</a>
 <div id="deployables" style="display:none">
 <ul>
-<li> 📝 <code>DisputeResolver</code></li>
-<li> 📝 <code>DisputeTemplateRegistry</code></li>
 <li> 📝 <code>DisputeKitClassic</code></li>
 <li> 📝 <code>DisputeKitGated</code></li>
 <li> 📝 <code>DisputeKitGatedShutter</code></li>
@@ -184,14 +178,14 @@ The analysis finished with **`0`** errors and **`0`** duplicate files.
 
 #### <span id=t-inline-documentation>Inline Documentation</span>
 
-- **Comment-to-Source Ratio:** On average there are`1.59` code lines per comment (lower=better).
-- **ToDo's:** `2`
+- **Comment-to-Source Ratio:** On average there are`1.56` code lines per comment (lower=better).
+- **ToDo's:** `3`
 
 #### <span id=t-components>Components</span>
 
 | 📝Contracts | 📚Libraries | 🔍Interfaces | 🎨Abstract |
 | ----------- | ----------- | ------------ | ---------- |
-| 16          | 2           | 13           | 5          |
+| 14          | 2           | 13           | 3          |
 
 #### <span id=t-exposed-functions>Exposed Functions</span>
 
@@ -199,23 +193,23 @@ This section lists functions that are explicitly declared public or payable. Ple
 
 | 🌐Public | 💰Payable |
 | -------- | --------- |
-| 192      | 10        |
+| 191      | 10        |
 
 | External | Internal | Private | Pure | View |
 | -------- | -------- | ------- | ---- | ---- |
-| 175      | 217      | 2       | 13   | 80   |
+| 175      | 197      | 1       | 9    | 92   |
 
 #### <span id=t-statevariables>StateVariables</span>
 
 | Total | 🌐Public |
 | ----- | -------- |
-| 87    | 80       |
+| 88    | 82       |
 
 #### <span id=t-capabilities>Capabilities</span>
 
-| Solidity Versions observed     | 🧪 Experimental Features | 💰 Can Receive Funds | 🖥 Uses Assembly           | 💣 Has Destroyable Contracts |
-| ------------------------------ | ------------------------ | -------------------- | -------------------------- | ---------------------------- |
-| `^0.8.24`<br/>`>=0.8.0 <0.9.0` |                          | `yes`                | `yes` <br/>(12 asm blocks) | \*\*\*\*                     |
+| Solidity Versions observed                   | 🧪 Experimental Features | 💰 Can Receive Funds | 🖥 Uses Assembly           | 💣 Has Destroyable Contracts |
+| -------------------------------------------- | ------------------------ | -------------------- | -------------------------- | ---------------------------- |
+| `^0.8.24`<br/>`^0.8.28`<br/>`>=0.8.0 <0.9.0` |                          | `yes`                | `yes` <br/>(10 asm blocks) | \*\*\*\*                     |
 
 | 📤 Transfers ETH | ⚡ Low-Level Calls | 👥 DelegateCall | 🧮 Uses Hash Functions | 🔖 ECRecover | 🌀 New/Create/Create2 |
 | ---------------- | ------------------ | --------------- | ---------------------- | ------------ | --------------------- |
@@ -229,7 +223,6 @@ This section lists functions that are explicitly declared public or payable. Ple
 
 | Dependency / Import Path                                            | Count |
 | ------------------------------------------------------------------- | ----- |
-| @chainlink/contracts/src/v0.8/vrf/dev/VRFConsumerBaseV2Plus.sol     | 1     |
 | @chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol | 1     |
 | @openzeppelin/contracts/token/ERC20/IERC20.sol                      | 3     |
 | @openzeppelin/contracts/token/ERC721/IERC721.sol                    | 1     |
@@ -292,380 +285,360 @@ Files Description Table
 
 | File Name                                                 | SHA-1 Hash                               |
 | --------------------------------------------------------- | ---------------------------------------- |
-| src/arbitration/KlerosCore.sol                            | 5362842ab3a88870e8b3b42cd7cf7a2058240483 |
-| src/arbitration/KlerosCoreBase.sol                        | fe829c80ad434e185151a8b5d299a585f576c619 |
-| src/arbitration/KlerosCoreNeo.sol                         | 0260ef7a9309d5c73c4c9b1a3f5c7653904f79c7 |
-| src/arbitration/PolicyRegistry.sol                        | c36299120ac7318dd29e4ab86f50b0447d87af96 |
-| src/arbitration/SortitionModule.sol                       | c1c1b2dd061590cd6c7eee41767e5c3fb898d506 |
-| src/arbitration/SortitionModuleBase.sol                   | 7b1037fcdfffc58bf3522f70ed128cad4915e032 |
-| src/arbitration/SortitionModuleNeo.sol                    | 8570ebeff10d723ce33b75e077dffb6fcf6e2f08 |
-| src/arbitration/arbitrables/DisputeResolver.sol           | 7dad21f0219e0a1b698859205bbf31b07abfdc7c |
-| src/arbitration/DisputeTemplateRegistry.sol               | c31e000957b979dc513d8b123253adb9edce50c7 |
-| src/arbitration/dispute-kits/DisputeKitClassic.sol        | 32bcb287571a3c4a861659be31a1ee2dc6ea6784 |
-| src/arbitration/dispute-kits/DisputeKitClassicBase.sol    | 7c0b04f3e73c0a10a29abfa78f78220e4e43f983 |
-| src/arbitration/dispute-kits/DisputeKitGated.sol          | e5f7f2ecd65f5e279c7b55e9edbe6f4cfc5fd632 |
-| src/arbitration/dispute-kits/DisputeKitGatedShutter.sol   | abb7f1ac20fa60db95d97fea6e9396b108d40924 |
-| src/arbitration/dispute-kits/DisputeKitShutter.sol        | 3720b60db303b866eacbb3dee529a638eaf6782e |
-| src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 69158bf07e78b3cb9892a5fd6cfc768181989a7f |
-| src/arbitration/evidence/EvidenceModule.sol               | 45845f3d5ad5548a30698105061bc0e64fd7718f |
+| src/arbitration/KlerosCore.sol                            | 383e209070883ddd480ef42f775d9c46dd3a9312 |
+| src/arbitration/PolicyRegistry.sol                        | 513ee51fc5262e41bf1ee58c19011b2166bb8281 |
+| src/arbitration/SortitionModule.sol                       | 455986084175670bcd15911f4f04cbf64203da41 |
+| src/arbitration/arbitrables/DisputeResolver.sol           | 985b9082c8187d8c4d35e1c88c54f954532cd94f |
+| src/arbitration/DisputeTemplateRegistry.sol               | 3cc2892233d940bf4523414680e361869f6df054 |
+| src/arbitration/dispute-kits/DisputeKitClassic.sol        | b7a6a3c1e021f11c8f6f8ae7c184e947a7cd45d9 |
+| src/arbitration/dispute-kits/DisputeKitClassicBase.sol    | c0d30028020e75203758df5241cdaf1138464b75 |
+| src/arbitration/dispute-kits/DisputeKitGated.sol          | c98ed7a48f251debdd88a325245dcb8e04926311 |
+| src/arbitration/dispute-kits/DisputeKitGatedShutter.sol   | bfe8f9e2598454027643644e246140623d5c73a8 |
+| src/arbitration/dispute-kits/DisputeKitShutter.sol        | b77e1e9ddfcf19c31570f0bfbf01c18086c99f56 |
+| src/arbitration/dispute-kits/DisputeKitSybilResistant.sol | 8bba9bb201d66fc07abc436b7830701a92e0ffb6 |
+| src/arbitration/evidence/EvidenceModule.sol               | 0098cc5e9939d1193f152890dfc94729a0d8bbd4 |
 | src/arbitration/interfaces/IArbitrableV2.sol              | ce54b7140a6109b2d919cea38ff94ac2ad775398 |
 | src/arbitration/interfaces/IArbitratorV2.sol              | 4e0baa0ff6155737540105f9fdb5b54ba2905d2c |
-| src/arbitration/interfaces/IDisputeKit.sol                | f21b52ed28a905b3073adaf68961938200cfd644 |
+| src/arbitration/interfaces/IDisputeKit.sol                | 06e3c893fca325de50367a1a862036771295885b |
 | src/arbitration/interfaces/IDisputeTemplateRegistry.sol   | 8d0351ebeee1ebd8603af9cf50c2ab62f6e8fecb |
 | src/arbitration/interfaces/IEvidence.sol                  | 12ee130f67f5d38afbcc810129b030cf7f58f058 |
-| src/arbitration/interfaces/ISortitionModule.sol           | 2c6d74752298263f7c649e3feecfb9a03c87a16a |
-| src/libraries/Constants.sol                               | 4d1d44dbeeda03f47a646e9552873d26acf4254d |
+| src/arbitration/interfaces/ISortitionModule.sol           | ea2526039c8675ddbc387198b29600a49c3584c1 |
+| src/libraries/Constants.sol                               | 6ce9e86c301042de2d32f9a3a5cfc2d65c34fa47 |
 | src/libraries/SafeERC20.sol                               | 68e49603280eab2b68eabc554dc310ff3313a64c |
 | src/libraries/SafeSend.sol                                | 9d282cf6456950471debec28103fcb99638fa83d |
-| src/rng/RNGWithFallback.sol                               | 9729dbce3e1dd5981073df38ac31fe356aae0027 |
-| src/rng/ChainlinkRNG.sol                                  | ce0d145807bc7b5b59b0e29ba468d9b0c0dc0314 |
-| src/rng/IRNG.sol                                          | d701581ef4910cdde9dbc3006dd0229cc3ea6012 |
+| src/rng/RNGWithFallback.sol                               | 0d90b33bb4fdeb9492d5b2474135790cd0c986e5 |
+| src/rng/ChainlinkRNG.sol                                  | 54f081a26e78c5aa0d58207372944a603eae5cf7 |
+| src/rng/IRNG.sol                                          | 25eee63b46a76183c24b39d81ae85044474a6a02 |
 | src/proxy/UUPSProxiable.sol                               | 80d46ace20ea4c9c6a0cbc1093d6e88eb19aeb12 |
 | src/proxy/UUPSProxy.sol                                   | 18a2a570a8ef2ec5f02d59bd1c03a176203e8ccf |
-| src/proxy/Initializable.sol                               | 7079462341810d12b0c0ea93845d053bdcbdabff |
+| src/proxy/Initializable.sol                               | bf3ba9453bab903eda4247e90e39376e20744353 |
 
 Contracts Description Table
 
-|           Contract           |                  Type                   |                         Bases                          |                |                                        |
-| :--------------------------: | :-------------------------------------: | :----------------------------------------------------: | :------------: | :------------------------------------: |
-|              └               |            **Function Name**            |                     **Visibility**                     | **Mutability** |             **Modifiers**              |
-|                              |                                         |                                                        |                |                                        |
-|        **KlerosCore**        |             Implementation              |                     KlerosCoreBase                     |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |              reinitialize               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|                              |                                         |                                                        |                |                                        |
-|      **KlerosCoreBase**      |             Implementation              |      IArbitratorV2, Initializable, UUPSProxiable       |                |                                        |
-|              └               |      \_\_KlerosCoreBase_initialize      |                      Internal 🔒                       |       🛑       |            onlyInitializing            |
-|              └               |                  pause                  |                      External ❗️                       |       🛑       | onlyByGuardianOrGovernor whenNotPaused |
-|              └               |                 unpause                 |                      External ❗️                       |       🛑       |       onlyByGovernor whenPaused        |
-|              └               |         executeGovernorProposal         |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             changeGuardian              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             changePinakion              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |      changeJurorProsecutionModule       |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeSortitionModule          |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |            addNewDisputeKit             |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |               createCourt               |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeCourtParameters          |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |            enableDisputeKits            |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |         changeAcceptedFeeTokens         |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |           changeCurrencyRates           |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |                setStake                 |                      External ❗️                       |       🛑       |             whenNotPaused              |
-|              └               |        setStakeBySortitionModule        |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |        transferBySortitionModule        |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |              createDispute              |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |              createDispute              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |             \_createDispute             |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |               passPeriod                |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                  draw                   |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                 appeal                  |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |                 execute                 |                      External ❗️                       |       🛑       |             whenNotPaused              |
-|              └               |           \_executePenalties            |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |            \_executeRewards             |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |              executeRuling              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |             arbitrationCost             |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |             arbitrationCost             |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |               appealCost                |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |              appealPeriod               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              currentRuling              |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |              getRoundInfo               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |          getPnkAtStakePerJuror          |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getNumberOfRounds            |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |               isSupported               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getTimesPerPeriod            |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getNumberOfVotes             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |           isDisputeKitJumping           |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |          getDisputeKitsLength           |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |         convertEthToTokenAmount         |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |           \_transferFeeToken            |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |            \_applyCoherence             |                      Internal 🔒                       |                |                                        |
-|              └               |          \_calculatePnkAtStake          |                      Internal 🔒                       |                |                                        |
-|              └               |           \_enableDisputeKit            |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |               \_setStake                |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |             \_stakingFailed             |                      Internal 🔒                       |                |                                        |
-|              └               | \_extraDataToCourtIDMinJurorsDisputeKit |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|      **KlerosCoreNeo**       |             Implementation              |                     KlerosCoreBase                     |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |              reinitialize               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |             changeJurorNft              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |        changeArbitrableWhitelist        |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |                setStake                 |                      External ❗️                       |       🛑       |             whenNotPaused              |
-|              └               |             \_createDispute             |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |             \_stakingFailed             |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|      **PolicyRegistry**      |             Implementation              |              UUPSProxiable, Initializable              |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |               initialize2               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |                setPolicy                |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|                              |                                         |                                                        |                |                                        |
-|     **SortitionModule**      |             Implementation              |                  SortitionModuleBase                   |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |               initialize4               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|                              |                                         |                                                        |                |                                        |
-|   **SortitionModuleBase**    |             Implementation              |     ISortitionModule, Initializable, UUPSProxiable     |                |                                        |
-|              └               |   \_\_SortitionModuleBase_initialize    |                      Internal 🔒                       |       🛑       |            onlyInitializing            |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeMinStakingTime           |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeMaxDrawingTime           |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |       changeRandomNumberGenerator       |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |                passPhase                |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |               createTree                |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |          executeDelayedStakes           |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |            createDisputeHook            |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |              postDrawHook               |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |           notifyRandomNumber            |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |              validateStake              |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |             \_validateStake             |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |                setStake                 |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |               \_setStake                |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |                lockStake                |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |               unlockStake               |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |              penalizeStake              |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |            setJurorInactive             |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |           withdrawLeftoverPNK           |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                  draw                   |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |                 stakeOf                 |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |                 stakeOf                 |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |             getJurorBalance             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getJurorCourtIDs             |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |              isJurorStaked              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |           getJurorLeftoverPNK           |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |             \_updateParents             |                       Private 🔐                       |       🛑       |                                        |
-|              └               |         \_stakePathIDToAccount          |                      Internal 🔒                       |                |                                        |
-|              └               |           \_extraDataToTreeK            |                      Internal 🔒                       |                |                                        |
-|              └               |                  \_set                  |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |    \_accountAndCourtIDToStakePathID     |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|    **SortitionModuleNeo**    |             Implementation              |                  SortitionModuleBase                   |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |               initialize4               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |         changeMaxStakePerJuror          |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeMaxTotalStaked           |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             \_validateStake             |                      Internal 🔒                       |       🛑       |               onlyByCore               |
-|                              |                                         |                                                        |                |                                        |
-|     **DisputeResolver**      |             Implementation              |                     IArbitrableV2                      |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |            changeArbitrator             |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |         changeTemplateRegistry          |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |        createDisputeForTemplate         |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |       createDisputeForTemplateUri       |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |                  rule                   |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |             \_createDispute             |                      Internal 🔒                       |       🛑       |                                        |
-|                              |                                         |                                                        |                |                                        |
-| **DisputeTemplateRegistry**  |             Implementation              | IDisputeTemplateRegistry, UUPSProxiable, Initializable |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |               initialize2               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |           setDisputeTemplate            |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|    **DisputeKitClassic**     |             Implementation              |                 DisputeKitClassicBase                  |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |              reinitialize               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|                              |                                         |                                                        |                |                                        |
-|  **DisputeKitClassicBase**   |             Implementation              |       IDisputeKit, Initializable, UUPSProxiable        |                |                                        |
-|              └               |  \_\_DisputeKitClassicBase_initialize   |                      Internal 🔒                       |       🛑       |            onlyInitializing            |
-|              └               |         executeGovernorProposal         |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |               changeCore                |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |              createDispute              |                      External ❗️                       |       🛑       |               onlyByCore               |
-|              └               |                  draw                   |                      External ❗️                       |       🛑       |          onlyByCore notJumped          |
-|              └               |               castCommit                |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |              \_castCommit               |                      Internal 🔒                       |       🛑       |               notJumped                |
-|              └               |                castVote                 |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |               \_castVote                |                      Internal 🔒                       |       🛑       |               notJumped                |
-|              └               |               fundAppeal                |                      External ❗️                       |       💵       |               notJumped                |
-|              └               |         withdrawFeesAndRewards          |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                hashVote                 |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |            getFundedChoices             |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |              currentRuling              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |          getDegreeOfCoherence           |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getCoherentCount             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            areCommitsAllCast            |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             areVotesAllCast             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             isAppealFunded              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              isVoteActive               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              getRoundInfo               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getNumberOfRounds            |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |         getLocalDisputeRoundID          |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |               getVoteInfo               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|      **IBalanceHolder**      |                Interface                |                                                        |                |                                        |
-|              └               |                balanceOf                |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|  **IBalanceHolderERC1155**   |                Interface                |                                                        |                |                                        |
-|              └               |                balanceOf                |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|     **DisputeKitGated**      |             Implementation              |                 DisputeKitClassicBase                  |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |              reinitialize               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |          extraDataToTokenInfo           |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|      **IBalanceHolder**      |                Interface                |                                                        |                |                                        |
-|              └               |                balanceOf                |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|  **IBalanceHolderERC1155**   |                Interface                |                                                        |                |                                        |
-|              └               |                balanceOf                |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|  **DisputeKitGatedShutter**  |             Implementation              |                 DisputeKitClassicBase                  |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |              reinitialize               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |            castCommitShutter            |                      External ❗️                       |       🛑       |               notJumped                |
-|              └               |             castVoteShutter             |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                hashVote                 |                       Public ❗️                        |                |                  NO❗️                  |
-|              └               |         \_extraDataToTokenInfo          |                      Internal 🔒                       |                |                                        |
-|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|    **DisputeKitShutter**     |             Implementation              |                 DisputeKitClassicBase                  |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |              reinitialize               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |            castCommitShutter            |                      External ❗️                       |       🛑       |               notJumped                |
-|              └               |             castVoteShutter             |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                hashVote                 |                       Public ❗️                        |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|     **IProofOfHumanity**     |                Interface                |                                                        |                |                                        |
-|              └               |              isRegistered               |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-| **DisputeKitSybilResistant** |             Implementation              |                 DisputeKitClassicBase                  |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|      **EvidenceModule**      |             Implementation              |        IEvidence, Initializable, UUPSProxiable         |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               initialize                |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |               initialize2               |                      External ❗️                       |       🛑       |             reinitializer              |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByGovernor             |
-|              └               |             submitEvidence              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|      **IArbitrableV2**       |                Interface                |                                                        |                |                                        |
-|              └               |                  rule                   |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|      **IArbitratorV2**       |                Interface                |                                                        |                |                                        |
-|              └               |              createDispute              |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |              createDispute              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |             arbitrationCost             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             arbitrationCost             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              currentRuling              |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|       **IDisputeKit**        |                Interface                |                                                        |                |                                        |
-|              └               |              createDispute              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                  draw                   |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |              currentRuling              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |          getDegreeOfCoherence           |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getCoherentCount             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            areCommitsAllCast            |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             areVotesAllCast             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             isAppealFunded              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              isVoteActive               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              getRoundInfo               |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |               getVoteInfo               |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-| **IDisputeTemplateRegistry** |                Interface                |                                                        |                |                                        |
-|              └               |           setDisputeTemplate            |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|        **IEvidence**         |                Interface                |                                                        |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|     **ISortitionModule**     |                Interface                |                                                        |                |                                        |
-|              └               |               createTree                |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |              validateStake              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                setStake                 |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |            setJurorInactive             |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                lockStake                |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |               unlockStake               |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |              penalizeStake              |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |           notifyRandomNumber            |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |                  draw                   |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |             getJurorBalance             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            getJurorCourtIDs             |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |              isJurorStaked              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |           getJurorLeftoverPNK           |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |            createDisputeHook            |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |              postDrawHook               |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |           withdrawLeftoverPNK           |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|        **SafeERC20**         |                 Library                 |                                                        |                |                                        |
-|              └               |            increaseAllowance            |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |              safeTransfer               |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |            safeTransferFrom             |                      Internal 🔒                       |       🛑       |                                        |
-|                              |                                         |                                                        |                |                                        |
-|         **WethLike**         |                Interface                |                                                        |                |                                        |
-|              └               |                 deposit                 |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |                transfer                 |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|         **SafeSend**         |                 Library                 |                                                        |                |                                        |
-|              └               |                safeSend                 |                      Internal 🔒                       |       🛑       |                                        |
-|                              |                                         |                                                        |                |                                        |
-|     **RNGWithFallback**      |             Implementation              |                          IRNG                          |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             changeConsumer              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeFallbackTimeout          |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |            requestRandomness            |                      External ❗️                       |       🛑       |             onlyByConsumer             |
-|              └               |            receiveRandomness            |                      External ❗️                       |       🛑       |             onlyByConsumer             |
-|                              |                                         |                                                        |                |                                        |
-|       **ChainlinkRNG**       |             Implementation              |              IRNG, VRFConsumerBaseV2Plus               |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |         VRFConsumerBaseV2Plus          |
-|              └               |             changeGovernor              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |             changeConsumer              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeVrfCoordinator           |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |              changeKeyHash              |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |          changeSubscriptionId           |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |       changeRequestConfirmations        |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |         changeCallbackGasLimit          |                      External ❗️                       |       🛑       |             onlyByGovernor             |
-|              └               |            requestRandomness            |                      External ❗️                       |       🛑       |             onlyByConsumer             |
-|              └               |           fulfillRandomWords            |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |            receiveRandomness            |                      External ❗️                       |                |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|           **IRNG**           |                Interface                |                                                        |                |                                        |
-|              └               |            requestRandomness            |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|              └               |            receiveRandomness            |                      External ❗️                       |       🛑       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|      **UUPSProxiable**       |             Implementation              |                                                        |                |                                        |
-|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |            upgradeToAndCall             |                       Public ❗️                        |       💵       |                  NO❗️                  |
-|              └               |              proxiableUUID              |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |                 version                 |                      External ❗️                       |                |                  NO❗️                  |
-|              └               |           \_getImplementation           |                      Internal 🔒                       |                |                                        |
-|                              |                                         |                                                        |                |                                        |
-|        **UUPSProxy**         |             Implementation              |                                                        |                |                                        |
-|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                  NO❗️                  |
-|              └               |               \_delegate                |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |           \_getImplementation           |                      Internal 🔒                       |                |                                        |
-|              └               |               <Fallback>                |                      External ❗️                       |       💵       |                  NO❗️                  |
-|              └               |             <Receive Ether>             |                      External ❗️                       |       💵       |                  NO❗️                  |
-|                              |                                         |                                                        |                |                                        |
-|      **Initializable**       |             Implementation              |                                                        |                |                                        |
-|              └               |           \_checkInitializing           |                      Internal 🔒                       |                |                                        |
-|              └               |          \_disableInitializers          |                      Internal 🔒                       |       🛑       |                                        |
-|              └               |         \_getInitializedVersion         |                      Internal 🔒                       |                |                                        |
-|              └               |            \_isInitializing             |                      Internal 🔒                       |                |                                        |
-|              └               |        \_getInitializableStorage        |                       Private 🔐                       |                |                                        |
+|           Contract           |                  Type                   |                         Bases                          |                |                                     |
+| :--------------------------: | :-------------------------------------: | :----------------------------------------------------: | :------------: | :---------------------------------: |
+|              └               |            **Function Name**            |                     **Visibility**                     | **Mutability** |            **Modifiers**            |
+|                              |                                         |                                                        |                |                                     |
+|        **KlerosCore**        |             Implementation              |      IArbitratorV2, Initializable, UUPSProxiable       |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |                  pause                  |                      External ❗️                       |       🛑       | onlyByGuardianOrOwner whenNotPaused |
+|              └               |                 unpause                 |                      External ❗️                       |       🛑       |       onlyByOwner whenPaused        |
+|              └               |          executeOwnerProposal           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |             changeGuardian              |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |             changePinakion              |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |      changeJurorProsecutionModule       |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeSortitionModule          |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |            addNewDisputeKit             |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |               createCourt               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeCourtParameters          |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |            enableDisputeKits            |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |         changeAcceptedFeeTokens         |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |           changeCurrencyRates           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |             changeJurorNft              |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |        changeArbitrableWhitelist        |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |    changeArbitrableWhitelistEnabled     |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |                setStake                 |                      External ❗️                       |       🛑       |            whenNotPaused            |
+|              └               |        setStakeBySortitionModule        |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |        transferBySortitionModule        |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |              createDispute              |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |              createDispute              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |             \_createDispute             |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |               passPeriod                |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                  draw                   |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                 appeal                  |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |                 execute                 |                      External ❗️                       |       🛑       |            whenNotPaused            |
+|              └               |           \_executePenalties            |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |            \_executeRewards             |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |              executeRuling              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |             arbitrationCost             |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |             arbitrationCost             |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |               appealCost                |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |              appealPeriod               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              currentRuling              |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |              getRoundInfo               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |          getPnkAtStakePerJuror          |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getNumberOfRounds            |                      External ❗️                       |                |                NO❗️                 |
+|              └               |               isSupported               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getTimesPerPeriod            |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getNumberOfVotes             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |           isDisputeKitJumping           |                      External ❗️                       |                |                NO❗️                 |
+|              └               |          getDisputeKitsLength           |                      External ❗️                       |                |                NO❗️                 |
+|              └               |         convertEthToTokenAmount         |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |            \_isCourtJumping             |                      Internal 🔒                       |                |                                     |
+|              └               |      \_getCourtAndDisputeKitJumps       |                      Internal 🔒                       |                |                                     |
+|              └               |           \_transferFeeToken            |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |            \_applyCoherence             |                      Internal 🔒                       |                |                                     |
+|              └               |          \_calculatePnkAtStake          |                      Internal 🔒                       |                |                                     |
+|              └               |           \_enableDisputeKit            |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |               \_setStake                |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |             \_stakingFailed             |                      Internal 🔒                       |                |                                     |
+|              └               | \_extraDataToCourtIDMinJurorsDisputeKit |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|      **PolicyRegistry**      |             Implementation              |              UUPSProxiable, Initializable              |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |                setPolicy                |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|                              |                                         |                                                        |                |                                     |
+|     **SortitionModule**      |             Implementation              |     ISortitionModule, Initializable, UUPSProxiable     |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeMinStakingTime           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeMaxDrawingTime           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |       changeRandomNumberGenerator       |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |         changeMaxStakePerJuror          |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeMaxTotalStaked           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |                passPhase                |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |               createTree                |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |          executeDelayedStakes           |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |            createDisputeHook            |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |              postDrawHook               |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |           notifyRandomNumber            |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |              validateStake              |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |             \_validateStake             |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |                setStake                 |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |             setStakePenalty             |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |             setStakeReward              |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |               \_setStake                |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |                lockStake                |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |               unlockStake               |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |         forcedUnstakeAllCourts          |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |              forcedUnstake              |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |           withdrawLeftoverPNK           |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                  draw                   |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |                 stakeOf                 |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |             getJurorBalance             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getJurorCourtIDs             |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |              isJurorStaked              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |           getJurorLeftoverPNK           |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |           \_extraDataToTreeK            |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|     **DisputeResolver**      |             Implementation              |                     IArbitrableV2                      |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |            changeArbitrator             |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |         changeTemplateRegistry          |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |        createDisputeForTemplate         |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |       createDisputeForTemplateUri       |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |                  rule                   |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |             \_createDispute             |                      Internal 🔒                       |       🛑       |                                     |
+|                              |                                         |                                                        |                |                                     |
+| **DisputeTemplateRegistry**  |             Implementation              | IDisputeTemplateRegistry, UUPSProxiable, Initializable |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |           setDisputeTemplate            |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|    **DisputeKitClassic**     |             Implementation              |                 DisputeKitClassicBase                  |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|                              |                                         |                                                        |                |                                     |
+|  **DisputeKitClassicBase**   |             Implementation              |       IDisputeKit, Initializable, UUPSProxiable        |                |                                     |
+|              └               |  \_\_DisputeKitClassicBase_initialize   |                      Internal 🔒                       |       🛑       |          onlyInitializing           |
+|              └               |          executeOwnerProposal           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |               changeCore                |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |         changeJumpDisputeKitID          |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |              createDispute              |                      External ❗️                       |       🛑       |             onlyByCore              |
+|              └               |                  draw                   |                      External ❗️                       |       🛑       |        onlyByCore notJumped         |
+|              └               |               castCommit                |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |              \_castCommit               |                      Internal 🔒                       |       🛑       |              notJumped              |
+|              └               |                castVote                 |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |               \_castVote                |                      Internal 🔒                       |       🛑       |              notJumped              |
+|              └               |               fundAppeal                |                      External ❗️                       |       💵       |              notJumped              |
+|              └               |         withdrawFeesAndRewards          |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                hashVote                 |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |            getFundedChoices             |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |              currentRuling              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |       getDegreeOfCoherenceReward        |                      External ❗️                       |                |                NO❗️                 |
+|              └               |       getDegreeOfCoherencePenalty       |                      External ❗️                       |                |                NO❗️                 |
+|              └               |         \_getDegreeOfCoherence          |                      Internal 🔒                       |                |                                     |
+|              └               |            getCoherentCount             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            areCommitsAllCast            |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             areVotesAllCast             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             isAppealFunded              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             earlyCourtJump              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |          getNbVotesAfterAppeal          |                      External ❗️                       |                |                NO❗️                 |
+|              └               |           getJumpDisputeKitID           |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              isVoteActive               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              getRoundInfo               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getNumberOfRounds            |                      External ❗️                       |                |                NO❗️                 |
+|              └               |         getLocalDisputeRoundID          |                      External ❗️                       |                |                NO❗️                 |
+|              └               |               getVoteInfo               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |          \_getExpectedVoteHash          |                      Internal 🔒                       |                |                                     |
+|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|      **IBalanceHolder**      |                Interface                |                                                        |                |                                     |
+|              └               |                balanceOf                |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|  **IBalanceHolderERC1155**   |                Interface                |                                                        |                |                                     |
+|              └               |                balanceOf                |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|     **DisputeKitGated**      |             Implementation              |                 DisputeKitClassicBase                  |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |          extraDataToTokenInfo           |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|      **IBalanceHolder**      |                Interface                |                                                        |                |                                     |
+|              └               |                balanceOf                |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|  **IBalanceHolderERC1155**   |                Interface                |                                                        |                |                                     |
+|              └               |                balanceOf                |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|  **DisputeKitGatedShutter**  |             Implementation              |                 DisputeKitClassicBase                  |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |            castCommitShutter            |                      External ❗️                       |       🛑       |              notJumped              |
+|              └               |             castVoteShutter             |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                hashVote                 |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |          \_getExpectedVoteHash          |                      Internal 🔒                       |                |                                     |
+|              └               |         \_extraDataToTokenInfo          |                      Internal 🔒                       |                |                                     |
+|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|    **DisputeKitShutter**     |             Implementation              |                 DisputeKitClassicBase                  |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |            castCommitShutter            |                      External ❗️                       |       🛑       |              notJumped              |
+|              └               |             castVoteShutter             |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                hashVote                 |                       Public ❗️                        |                |                NO❗️                 |
+|              └               |          \_getExpectedVoteHash          |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|     **IProofOfHumanity**     |                Interface                |                                                        |                |                                     |
+|              └               |              isRegistered               |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+| **DisputeKitSybilResistant** |             Implementation              |                 DisputeKitClassicBase                  |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |             \_postDrawCheck             |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|      **EvidenceModule**      |             Implementation              |        IEvidence, Initializable, UUPSProxiable         |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               initialize                |                      External ❗️                       |       🛑       |             initializer             |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |                |             onlyByOwner             |
+|              └               |             submitEvidence              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|      **IArbitrableV2**       |                Interface                |                                                        |                |                                     |
+|              └               |                  rule                   |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|      **IArbitratorV2**       |                Interface                |                                                        |                |                                     |
+|              └               |              createDispute              |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |              createDispute              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |             arbitrationCost             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             arbitrationCost             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              currentRuling              |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|       **IDisputeKit**        |                Interface                |                                                        |                |                                     |
+|              └               |              createDispute              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                  draw                   |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |              currentRuling              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |       getDegreeOfCoherenceReward        |                      External ❗️                       |                |                NO❗️                 |
+|              └               |       getDegreeOfCoherencePenalty       |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getCoherentCount             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            areCommitsAllCast            |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             areVotesAllCast             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             isAppealFunded              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             earlyCourtJump              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |          getNbVotesAfterAppeal          |                      External ❗️                       |                |                NO❗️                 |
+|              └               |           getJumpDisputeKitID           |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              isVoteActive               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              getRoundInfo               |                      External ❗️                       |                |                NO❗️                 |
+|              └               |               getVoteInfo               |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+| **IDisputeTemplateRegistry** |                Interface                |                                                        |                |                                     |
+|              └               |           setDisputeTemplate            |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|        **IEvidence**         |                Interface                |                                                        |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|     **ISortitionModule**     |                Interface                |                                                        |                |                                     |
+|              └               |               createTree                |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |              validateStake              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                setStake                 |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |             setStakePenalty             |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |             setStakeReward              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |         forcedUnstakeAllCourts          |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |              forcedUnstake              |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                lockStake                |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |               unlockStake               |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |           notifyRandomNumber            |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |                  draw                   |                      External ❗️                       |                |                NO❗️                 |
+|              └               |             getJurorBalance             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            getJurorCourtIDs             |                      External ❗️                       |                |                NO❗️                 |
+|              └               |              isJurorStaked              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |           getJurorLeftoverPNK           |                      External ❗️                       |                |                NO❗️                 |
+|              └               |            createDisputeHook            |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |              postDrawHook               |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |           withdrawLeftoverPNK           |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|        **SafeERC20**         |                 Library                 |                                                        |                |                                     |
+|              └               |            increaseAllowance            |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |              safeTransfer               |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |            safeTransferFrom             |                      Internal 🔒                       |       🛑       |                                     |
+|                              |                                         |                                                        |                |                                     |
+|         **WethLike**         |                Interface                |                                                        |                |                                     |
+|              └               |                 deposit                 |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |                transfer                 |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|         **SafeSend**         |                 Library                 |                                                        |                |                                     |
+|              └               |                safeSend                 |                      Internal 🔒                       |       🛑       |                                     |
+|                              |                                         |                                                        |                |                                     |
+|     **RNGWithFallback**      |             Implementation              |                          IRNG                          |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |             changeConsumer              |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeFallbackTimeout          |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |            requestRandomness            |                      External ❗️                       |       🛑       |           onlyByConsumer            |
+|              └               |            receiveRandomness            |                      External ❗️                       |       🛑       |           onlyByConsumer            |
+|                              |                                         |                                                        |                |                                     |
+|       **ChainlinkRNG**       |             Implementation              |              IRNG, VRFConsumerBaseV2Plus               |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |        VRFConsumerBaseV2Plus        |
+|              └               |               changeOwner               |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |             changeConsumer              |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeVrfCoordinator           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |              changeKeyHash              |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |          changeSubscriptionId           |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |       changeRequestConfirmations        |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |         changeCallbackGasLimit          |                      External ❗️                       |       🛑       |             onlyByOwner             |
+|              └               |            requestRandomness            |                      External ❗️                       |       🛑       |           onlyByConsumer            |
+|              └               |           fulfillRandomWords            |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |            receiveRandomness            |                      External ❗️                       |                |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|           **IRNG**           |                Interface                |                                                        |                |                                     |
+|              └               |            requestRandomness            |                      External ❗️                       |       🛑       |                NO❗️                 |
+|              └               |            receiveRandomness            |                      External ❗️                       |       🛑       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|      **UUPSProxiable**       |             Implementation              |                                                        |                |                                     |
+|              └               |           \_authorizeUpgrade            |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |            upgradeToAndCall             |                       Public ❗️                        |       💵       |                NO❗️                 |
+|              └               |              proxiableUUID              |                      External ❗️                       |                |                NO❗️                 |
+|              └               |                 version                 |                      External ❗️                       |                |                NO❗️                 |
+|              └               |           \_getImplementation           |                      Internal 🔒                       |                |                                     |
+|                              |                                         |                                                        |                |                                     |
+|        **UUPSProxy**         |             Implementation              |                                                        |                |                                     |
+|              └               |              <Constructor>              |                       Public ❗️                        |       🛑       |                NO❗️                 |
+|              └               |               \_delegate                |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |           \_getImplementation           |                      Internal 🔒                       |                |                                     |
+|              └               |               <Fallback>                |                      External ❗️                       |       💵       |                NO❗️                 |
+|              └               |             <Receive Ether>             |                      External ❗️                       |       💵       |                NO❗️                 |
+|                              |                                         |                                                        |                |                                     |
+|      **Initializable**       |             Implementation              |                                                        |                |                                     |
+|              └               |           \_checkInitializing           |                      Internal 🔒                       |                |                                     |
+|              └               |          \_disableInitializers          |                      Internal 🔒                       |       🛑       |                                     |
+|              └               |         \_getInitializedVersion         |                      Internal 🔒                       |                |                                     |
+|              └               |            \_isInitializing             |                      Internal 🔒                       |                |                                     |
+|              └               |        \_getInitializableStorage        |                       Private 🔐                       |                |                                     |
 
 Legend
 
diff --git a/contracts/config/courts.v2.mainnet-neo.json b/contracts/config/courts.v2.mainnet.json
similarity index 100%
rename from contracts/config/courts.v2.mainnet-neo.json
rename to contracts/config/courts.v2.mainnet.json
diff --git a/contracts/config/policies.v2.mainnet-neo.json b/contracts/config/policies.v2.mainnet.json
similarity index 100%
rename from contracts/config/policies.v2.mainnet-neo.json
rename to contracts/config/policies.v2.mainnet.json
diff --git a/contracts/deploy/00-home-chain-arbitration-neo.ts b/contracts/deploy/00-home-chain-arbitration-mainnet.ts
similarity index 91%
rename from contracts/deploy/00-home-chain-arbitration-neo.ts
rename to contracts/deploy/00-home-chain-arbitration-mainnet.ts
index 36a895c74..a3d87f51f 100644
--- a/contracts/deploy/00-home-chain-arbitration-neo.ts
+++ b/contracts/deploy/00-home-chain-arbitration-mainnet.ts
@@ -6,7 +6,7 @@ import { changeCurrencyRate } from "./utils/klerosCoreHelper";
 import { HomeChains, isSkipped, isDevnet, PNK, ETH } from "./utils";
 import { getContractOrDeploy, getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 import { deployERC20AndFaucet, deployERC721 } from "./utils/deployTokens";
-import { ChainlinkRNG, DisputeKitClassic, KlerosCoreNeo, RNGWithFallback } from "../typechain-types";
+import { DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
 
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
@@ -29,18 +29,17 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   await deployUpgradable(deployments, "EvidenceModule", { from: deployer, args: [deployer], log: true });
 
   const classicDisputeKitID = 1; // Classic DK
-  const disputeKit = await deployUpgradable(deployments, "DisputeKitClassicNeo", {
+  const disputeKit = await deployUpgradable(deployments, "DisputeKitClassic", {
     from: deployer,
-    contract: "DisputeKitClassic",
     args: [deployer, ZeroAddress, weth.target, classicDisputeKitID],
     log: true,
   });
 
-  let klerosCoreAddress = await deployments.getOrNull("KlerosCoreNeo").then((deployment) => deployment?.address);
+  let klerosCoreAddress = await deployments.getOrNull("KlerosCore").then((deployment) => deployment?.address);
   if (!klerosCoreAddress) {
     const nonce = await ethers.provider.getTransactionCount(deployer);
     klerosCoreAddress = getContractAddress(deployer, nonce + 3); // deployed on the 4th tx (nonce+3): SortitionModule Impl tx, SortitionModule Proxy tx, KlerosCore Impl tx, KlerosCore Proxy tx
-    console.log("calculated future KlerosCoreNeo address for nonce %d: %s", nonce + 3, klerosCoreAddress);
+    console.log("calculated future KlerosCore address for nonce %d: %s", nonce + 3, klerosCoreAddress);
   }
   const devnet = isDevnet(hre.network);
   const minStakingTime = devnet ? 180 : 1800;
@@ -48,7 +47,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const rngWithFallback = await ethers.getContract<RNGWithFallback>("RNGWithFallback");
   const maxStakePerJuror = PNK(2_000);
   const maxTotalStaked = PNK(2_000_000);
-  const sortitionModule = await deployUpgradable(deployments, "SortitionModuleNeo", {
+  const sortitionModule = await deployUpgradable(deployments, "SortitionModule", {
     from: deployer,
     args: [
       deployer,
@@ -66,7 +65,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const alpha = 10000;
   const feeForJuror = ETH(0.1);
   const jurorsForCourtJump = 256;
-  const klerosCore = await deployUpgradable(deployments, "KlerosCoreNeo", {
+  const klerosCore = await deployUpgradable(deployments, "KlerosCore", {
     from: deployer,
     args: [
       deployer,
@@ -79,14 +78,14 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       [0, 0, 0, 10], // evidencePeriod, commitPeriod, votePeriod, appealPeriod
       ethers.toBeHex(5), // Extra data for sortition module will return the default value of K
       sortitionModule.address,
-      nft.target,
       weth.target,
+      nft.target,
     ],
     log: true,
   }); // nonce+2 (implementation), nonce+3 (proxy)
 
   // disputeKit.changeCore() only if necessary
-  const disputeKitContract = await hre.ethers.getContract<DisputeKitClassic>("DisputeKitClassicNeo");
+  const disputeKitContract = await hre.ethers.getContract<DisputeKitClassic>("DisputeKitClassic");
   const currentCore = await disputeKitContract.core();
   if (currentCore !== klerosCore.address) {
     console.log(`disputeKit.changeCore(${klerosCore.address})`);
@@ -100,7 +99,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     await rngWithFallback.changeConsumer(sortitionModule.address);
   }
 
-  const core = await hre.ethers.getContract<KlerosCoreNeo>("KlerosCoreNeo");
+  const core = await hre.ethers.getContract<KlerosCore>("KlerosCore");
   try {
     await changeCurrencyRate(core, await weth.getAddress(), true, 1, 1);
   } catch (e) {
@@ -113,12 +112,13 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     log: true,
   });
 
-  const resolver = await deploy("DisputeResolverNeo", {
+  const resolver = await deploy("DisputeResolver", {
     from: deployer,
-    contract: "DisputeResolver",
     args: [core.target, disputeTemplateRegistry.target],
     log: true,
   });
+  console.log(`core.changeArbitrableWhitelistEnabled(true)`);
+  await core.changeArbitrableWhitelistEnabled(true);
   console.log(`core.changeArbitrableWhitelist(${resolver.address}, true)`);
   await core.changeArbitrableWhitelist(resolver.address, true);
 
@@ -155,7 +155,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   });
 };
 
-deployArbitration.tags = ["ArbitrationNeo"];
+deployArbitration.tags = ["ArbitrationMainnet"];
 deployArbitration.dependencies = ["ChainlinkRNG"];
 deployArbitration.skip = async ({ network }) => {
   return isSkipped(network, !HomeChains[network.config.chainId ?? 0]);
diff --git a/contracts/deploy/00-home-chain-arbitration.ts b/contracts/deploy/00-home-chain-arbitration.ts
index 25291052d..1c4c29695 100644
--- a/contracts/deploy/00-home-chain-arbitration.ts
+++ b/contracts/deploy/00-home-chain-arbitration.ts
@@ -6,7 +6,7 @@ import { changeCurrencyRate } from "./utils/klerosCoreHelper";
 import { HomeChains, isSkipped, isDevnet, PNK, ETH, Courts } from "./utils";
 import { getContractOrDeploy, getContractOrDeployUpgradable } from "./utils/getContractOrDeploy";
 import { deployERC20AndFaucet } from "./utils/deployTokens";
-import { ChainlinkRNG, DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
+import { DisputeKitClassic, KlerosCore, RNGWithFallback } from "../typechain-types";
 
 const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { ethers, deployments, getNamedAccounts, getChainId } = hre;
@@ -53,7 +53,15 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
   const rngWithFallback = await ethers.getContract<RNGWithFallback>("RNGWithFallback");
   const sortitionModule = await deployUpgradable(deployments, "SortitionModule", {
     from: deployer,
-    args: [deployer, klerosCoreAddress, minStakingTime, maxFreezingTime, rngWithFallback.target],
+    args: [
+      deployer,
+      klerosCoreAddress,
+      minStakingTime,
+      maxFreezingTime,
+      rngWithFallback.target,
+      ethers.MaxUint256, // maxStakePerJuror
+      ethers.MaxUint256, // maxTotalStaked
+    ],
     log: true,
   }); // nonce (implementation), nonce+1 (proxy)
 
@@ -75,6 +83,7 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       ethers.toBeHex(5), // Extra data for sortition module will return the default value of K
       sortitionModule.address,
       weth.target,
+      ZeroAddress, // jurorNft
     ],
     log: true,
   }); // nonce+2 (implementation), nonce+3 (proxy)
diff --git a/contracts/deploy/change-sortition-module-rng.ts b/contracts/deploy/change-sortition-module-rng.ts
index 2b5e72435..986e408ec 100644
--- a/contracts/deploy/change-sortition-module-rng.ts
+++ b/contracts/deploy/change-sortition-module-rng.ts
@@ -1,8 +1,8 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { HomeChains, isMainnet, isSkipped } from "./utils";
+import { HomeChains, isSkipped } from "./utils";
 import { ethers } from "hardhat";
-import { ChainlinkRNG, SortitionModule, SortitionModuleNeo } from "../typechain-types";
+import { ChainlinkRNG, SortitionModule } from "../typechain-types";
 
 const task: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const { getNamedAccounts, getChainId } = hre;
@@ -13,15 +13,7 @@ const task: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   console.log("deploying to %s with deployer %s", HomeChains[chainId], deployer);
 
   const chainlinkRng = await ethers.getContract<ChainlinkRNG>("ChainlinkRNG");
-
-  let sortitionModule: SortitionModule | SortitionModuleNeo;
-  if (isMainnet(hre.network)) {
-    console.log("Using SortitionModuleNeo");
-    sortitionModule = await ethers.getContract<SortitionModuleNeo>("SortitionModuleNeo");
-  } else {
-    console.log("Using SortitionModule");
-    sortitionModule = await ethers.getContract<SortitionModule>("SortitionModule");
-  }
+  const sortitionModule = await ethers.getContract<SortitionModule>("SortitionModule");
 
   console.log(`chainlinkRng.changeConsumer(${sortitionModule.target})`);
   await chainlinkRng.changeConsumer(sortitionModule.target);
diff --git a/contracts/deploy/upgrade-all.ts b/contracts/deploy/upgrade-all.ts
index dfd0d882c..572ed7187 100644
--- a/contracts/deploy/upgrade-all.ts
+++ b/contracts/deploy/upgrade-all.ts
@@ -3,7 +3,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { prompt, print } from "gluegun";
 import { deployUpgradable } from "./utils/deployUpgradable";
 import { HomeChains, isSkipped } from "./utils";
-import { getContractNames, getContractNamesFromNetwork } from "../scripts/utils/contracts";
+import { getContractNamesFromNetwork } from "../scripts/utils/contracts";
 
 const { bold } = print.colors;
 
@@ -36,21 +36,7 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
     try {
       print.highlight(`🔍 Validating upgrade of ${bold(contractName)}`);
 
-      const contractNameWithoutNeo = contractName.replace(/Neo.*$/, "");
       let compareStorageOptions = { contract: contractName } as any;
-      if (hre.network.name === "arbitrum") {
-        switch (contractName) {
-          case "KlerosCoreNeo":
-          case "SortitionModuleNeo":
-            compareStorageOptions = { deployedArtifact: `${contractName}_Implementation`, contract: contractName };
-            break;
-          default:
-            compareStorageOptions = {
-              deployedArtifact: `${contractName}_Implementation`,
-              contract: contractNameWithoutNeo,
-            };
-        }
-      }
       await hre.run("compare-storage", compareStorageOptions);
       print.newline();
       print.highlight(`💣 Upgrading ${bold(contractName)}`);
@@ -65,25 +51,12 @@ const deployUpgradeAll: DeployFunction = async (hre: HardhatRuntimeEnvironment)
       }
       print.info(`Upgrading ${contractName}...`);
 
-      switch (contractName) {
-        case "DisputeKitClassicNeo":
-        case "DisputeResolverNeo":
-          await deployUpgradable(deployments, contractName, {
-            contract: contractName,
-            newImplementation: contractNameWithoutNeo,
-            initializer,
-            from: deployer,
-            args, // Warning: do not reinitialize existing state variables, only the new ones
-          });
-          break;
-        default:
-          await deployUpgradable(deployments, contractName, {
-            newImplementation: contractName,
-            initializer,
-            from: deployer,
-            args, // Warning: do not reinitialize existing state variables, only the new ones
-          });
-      }
+      await deployUpgradable(deployments, contractName, {
+        newImplementation: contractName,
+        initializer,
+        from: deployer,
+        args, // Warning: do not reinitialize existing state variables, only the new ones
+      });
       print.info(`Verifying ${contractName} on Etherscan...`);
       await hre.run("etherscan-verify", { contractName: `${contractName}_Implementation` });
     } catch (err) {
diff --git a/contracts/deploy/utils/klerosCoreHelper.ts b/contracts/deploy/utils/klerosCoreHelper.ts
index 3419ae64e..3325652a3 100644
--- a/contracts/deploy/utils/klerosCoreHelper.ts
+++ b/contracts/deploy/utils/klerosCoreHelper.ts
@@ -1,8 +1,8 @@
-import { KlerosCore, KlerosCoreNeo, KlerosCoreRuler, KlerosCoreUniversity } from "../../typechain-types";
+import { KlerosCore, KlerosCoreRuler, KlerosCoreUniversity } from "../../typechain-types";
 import { BigNumberish, toBigInt } from "ethers";
 
 export const changeCurrencyRate = async (
-  core: KlerosCore | KlerosCoreNeo | KlerosCoreRuler | KlerosCoreUniversity,
+  core: KlerosCore | KlerosCoreRuler | KlerosCoreUniversity,
   erc20: string,
   accepted: boolean,
   rateInEth: BigNumberish,
diff --git a/contracts/deployments/arbitrum.ts b/contracts/deployments/arbitrum.ts
index b0b8e8fd8..2b5d6eb3f 100644
--- a/contracts/deployments/arbitrum.ts
+++ b/contracts/deployments/arbitrum.ts
@@ -2793,7 +2793,7 @@ export default {
         },
       ],
     },
-    DisputeKitClassicNeo: {
+    DisputeKitClassic: {
       address: "0x70B464be85A547144C72485eBa2577E5D3A45421",
       abi: [
         {
@@ -3943,7 +3943,7 @@ export default {
         },
       ],
     },
-    DisputeKitClassicNeo_Implementation: {
+    DisputeKitClassic_Implementation: {
       address: "0x371Aa4B1AE5b5f9422f3Ff1d105029AAd1D319BC",
       abi: [
         {
@@ -5074,7 +5074,7 @@ export default {
         },
       ],
     },
-    DisputeKitClassicNeo_Proxy: {
+    DisputeKitClassic_Proxy: {
       address: "0x70B464be85A547144C72485eBa2577E5D3A45421",
       abi: [
         {
@@ -5103,7 +5103,7 @@ export default {
         },
       ],
     },
-    DisputeKitGatedNeo: {
+    DisputeKitGated: {
       address: "0xaE1eed20C125B739b64c948820C61F809ad9a925",
       abi: [
         {
@@ -6282,13 +6282,16 @@ export default {
         },
       ],
     },
-    DisputeKitGatedNeo_Implementation: {
-      address: "0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a",
+    DisputeKitGatedShutter: {
+      address: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
       abi: [
         {
-          inputs: [],
-          stateMutability: "nonpayable",
-          type: "constructor",
+          stateMutability: "payable",
+          type: "fallback",
+        },
+        {
+          stateMutability: "payable",
+          type: "receive",
         },
         {
           inputs: [],
@@ -6388,6 +6391,43 @@ export default {
           name: "CommitCast",
           type: "event",
         },
+        {
+          anonymous: false,
+          inputs: [
+            {
+              indexed: true,
+              internalType: "uint256",
+              name: "_coreDisputeID",
+              type: "uint256",
+            },
+            {
+              indexed: true,
+              internalType: "address",
+              name: "_juror",
+              type: "address",
+            },
+            {
+              indexed: true,
+              internalType: "bytes32",
+              name: "_commit",
+              type: "bytes32",
+            },
+            {
+              indexed: false,
+              internalType: "bytes32",
+              name: "_identity",
+              type: "bytes32",
+            },
+            {
+              indexed: false,
+              internalType: "bytes",
+              name: "_encryptedVote",
+              type: "bytes",
+            },
+          ],
+          name: "CommitCastShutter",
+          type: "event",
+        },
         {
           anonymous: false,
           inputs: [
@@ -6692,6 +6732,39 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "_coreDisputeID",
+              type: "uint256",
+            },
+            {
+              internalType: "uint256[]",
+              name: "_voteIDs",
+              type: "uint256[]",
+            },
+            {
+              internalType: "bytes32",
+              name: "_commit",
+              type: "bytes32",
+            },
+            {
+              internalType: "bytes32",
+              name: "_identity",
+              type: "bytes32",
+            },
+            {
+              internalType: "bytes",
+              name: "_encryptedVote",
+              type: "bytes",
+            },
+          ],
+          name: "castCommitShutter",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -6725,6 +6798,39 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "_coreDisputeID",
+              type: "uint256",
+            },
+            {
+              internalType: "uint256[]",
+              name: "_voteIDs",
+              type: "uint256[]",
+            },
+            {
+              internalType: "uint256",
+              name: "_choice",
+              type: "uint256",
+            },
+            {
+              internalType: "uint256",
+              name: "_salt",
+              type: "uint256",
+            },
+            {
+              internalType: "string",
+              name: "_justification",
+              type: "string",
+            },
+          ],
+          name: "castVoteShutter",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -6935,35 +7041,6 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
-        {
-          inputs: [
-            {
-              internalType: "bytes",
-              name: "_extraData",
-              type: "bytes",
-            },
-          ],
-          name: "extraDataToTokenInfo",
-          outputs: [
-            {
-              internalType: "address",
-              name: "tokenGate",
-              type: "address",
-            },
-            {
-              internalType: "bool",
-              name: "isERC1155",
-              type: "bool",
-            },
-            {
-              internalType: "uint256",
-              name: "tokenId",
-              type: "uint256",
-            },
-          ],
-          stateMutability: "pure",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -7440,11 +7517,6 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
-      ],
-    },
-    DisputeKitGatedNeo_Proxy: {
-      address: "0xaE1eed20C125B739b64c948820C61F809ad9a925",
-      abi: [
         {
           inputs: [
             {
@@ -7461,26 +7533,15 @@ export default {
           stateMutability: "nonpayable",
           type: "constructor",
         },
-        {
-          stateMutability: "payable",
-          type: "fallback",
-        },
-        {
-          stateMutability: "payable",
-          type: "receive",
-        },
       ],
     },
-    DisputeKitGatedShutterNeo: {
-      address: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
+    DisputeKitGatedShutter_Implementation: {
+      address: "0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32",
       abi: [
         {
-          stateMutability: "payable",
-          type: "fallback",
-        },
-        {
-          stateMutability: "payable",
-          type: "receive",
+          inputs: [],
+          stateMutability: "nonpayable",
+          type: "constructor",
         },
         {
           inputs: [],
@@ -8706,6 +8767,11 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
+      ],
+    },
+    DisputeKitGatedShutter_Proxy: {
+      address: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
+      abi: [
         {
           inputs: [
             {
@@ -8722,10 +8788,18 @@ export default {
           stateMutability: "nonpayable",
           type: "constructor",
         },
+        {
+          stateMutability: "payable",
+          type: "fallback",
+        },
+        {
+          stateMutability: "payable",
+          type: "receive",
+        },
       ],
     },
-    DisputeKitGatedShutterNeo_Implementation: {
-      address: "0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32",
+    DisputeKitGated_Implementation: {
+      address: "0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a",
       abi: [
         {
           inputs: [],
@@ -8830,43 +8904,6 @@ export default {
           name: "CommitCast",
           type: "event",
         },
-        {
-          anonymous: false,
-          inputs: [
-            {
-              indexed: true,
-              internalType: "uint256",
-              name: "_coreDisputeID",
-              type: "uint256",
-            },
-            {
-              indexed: true,
-              internalType: "address",
-              name: "_juror",
-              type: "address",
-            },
-            {
-              indexed: true,
-              internalType: "bytes32",
-              name: "_commit",
-              type: "bytes32",
-            },
-            {
-              indexed: false,
-              internalType: "bytes32",
-              name: "_identity",
-              type: "bytes32",
-            },
-            {
-              indexed: false,
-              internalType: "bytes",
-              name: "_encryptedVote",
-              type: "bytes",
-            },
-          ],
-          name: "CommitCastShutter",
-          type: "event",
-        },
         {
           anonymous: false,
           inputs: [
@@ -9171,39 +9208,6 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
-        {
-          inputs: [
-            {
-              internalType: "uint256",
-              name: "_coreDisputeID",
-              type: "uint256",
-            },
-            {
-              internalType: "uint256[]",
-              name: "_voteIDs",
-              type: "uint256[]",
-            },
-            {
-              internalType: "bytes32",
-              name: "_commit",
-              type: "bytes32",
-            },
-            {
-              internalType: "bytes32",
-              name: "_identity",
-              type: "bytes32",
-            },
-            {
-              internalType: "bytes",
-              name: "_encryptedVote",
-              type: "bytes",
-            },
-          ],
-          name: "castCommitShutter",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -9240,42 +9244,9 @@ export default {
         {
           inputs: [
             {
-              internalType: "uint256",
-              name: "_coreDisputeID",
-              type: "uint256",
-            },
-            {
-              internalType: "uint256[]",
-              name: "_voteIDs",
-              type: "uint256[]",
-            },
-            {
-              internalType: "uint256",
-              name: "_choice",
-              type: "uint256",
-            },
-            {
-              internalType: "uint256",
-              name: "_salt",
-              type: "uint256",
-            },
-            {
-              internalType: "string",
-              name: "_justification",
-              type: "string",
-            },
-          ],
-          name: "castVoteShutter",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "address",
-              name: "_core",
-              type: "address",
+              internalType: "address",
+              name: "_core",
+              type: "address",
             },
           ],
           name: "changeCore",
@@ -9480,6 +9451,35 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "bytes",
+              name: "_extraData",
+              type: "bytes",
+            },
+          ],
+          name: "extraDataToTokenInfo",
+          outputs: [
+            {
+              internalType: "address",
+              name: "tokenGate",
+              type: "address",
+            },
+            {
+              internalType: "bool",
+              name: "isERC1155",
+              type: "bool",
+            },
+            {
+              internalType: "uint256",
+              name: "tokenId",
+              type: "uint256",
+            },
+          ],
+          stateMutability: "pure",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -9958,8 +9958,8 @@ export default {
         },
       ],
     },
-    DisputeKitGatedShutterNeo_Proxy: {
-      address: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
+    DisputeKitGated_Proxy: {
+      address: "0xaE1eed20C125B739b64c948820C61F809ad9a925",
       abi: [
         {
           inputs: [
@@ -9987,7 +9987,7 @@ export default {
         },
       ],
     },
-    DisputeKitShutterNeo: {
+    DisputeKitShutter: {
       address: "0x9D3e3f1765744c2a1BC6F6088549770444BBC768",
       abi: [
         {
@@ -11240,7 +11240,7 @@ export default {
         },
       ],
     },
-    DisputeKitShutterNeo_Implementation: {
+    DisputeKitShutter_Implementation: {
       address: "0xF3103B46403A0bBd4551648BFb29BCC2b8783947",
       abi: [
         {
@@ -12474,7 +12474,7 @@ export default {
         },
       ],
     },
-    DisputeKitShutterNeo_Proxy: {
+    DisputeKitShutter_Proxy: {
       address: "0x9D3e3f1765744c2a1BC6F6088549770444BBC768",
       abi: [
         {
@@ -12503,7 +12503,7 @@ export default {
         },
       ],
     },
-    DisputeResolverNeo: {
+    DisputeResolver: {
       address: "0xb5526D022962A1fFf6eD32C93e8b714c901F4323",
       abi: [
         {
@@ -12798,7 +12798,7 @@ export default {
         },
       ],
     },
-    DisputeResolverRulerNeo: {
+    DisputeResolverRuler: {
       address: "0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140",
       abi: [
         {
@@ -14027,7 +14027,7 @@ export default {
         },
       ],
     },
-    KlerosCoreNeo: {
+    KlerosCore: {
       address: "0x991d2df165670b9cac3B022f4B68D65b664222ea",
       abi: [
         {
@@ -16069,32 +16069,25 @@ export default {
         },
       ],
     },
-    KlerosCoreNeo_Implementation: {
-      address: "0xC1210493804eEF123096F9581Ee82B915150E54c",
+    KlerosCoreRuler: {
+      address: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
       abi: [
         {
-          inputs: [],
-          stateMutability: "nonpayable",
-          type: "constructor",
-        },
-        {
-          inputs: [],
-          name: "AlreadyInitialized",
-          type: "error",
+          stateMutability: "payable",
+          type: "fallback",
         },
         {
-          inputs: [],
-          name: "AppealFeesNotEnough",
-          type: "error",
+          stateMutability: "payable",
+          type: "receive",
         },
         {
           inputs: [],
-          name: "AppealPeriodNotPassed",
+          name: "AlreadyInitialized",
           type: "error",
         },
         {
           inputs: [],
-          name: "ArbitrableNotWhitelisted",
+          name: "AppealFeesNotEnough",
           type: "error",
         },
         {
@@ -16102,46 +16095,11 @@ export default {
           name: "ArbitrationFeesNotEnough",
           type: "error",
         },
-        {
-          inputs: [],
-          name: "CannotDisableClassicDK",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "CommitPeriodNotPassed",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "DisputeKitNotSupportedByCourt",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "DisputeKitOnly",
-          type: "error",
-        },
         {
           inputs: [],
           name: "DisputeNotAppealable",
           type: "error",
         },
-        {
-          inputs: [],
-          name: "DisputePeriodIsFinal",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "DisputeStillDrawing",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "EvidenceNotPassedAndNotAppeal",
-          type: "error",
-        },
         {
           inputs: [],
           name: "FailedDelegateCall",
@@ -16154,12 +16112,7 @@ export default {
         },
         {
           inputs: [],
-          name: "GuardianOrGovernorOnly",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "InvalidDisputKitParent",
+          name: "GovernorOrInstructorOnly",
           type: "error",
         },
         {
@@ -16180,27 +16133,7 @@ export default {
         },
         {
           inputs: [],
-          name: "MinStakeLowerThanParentCourt",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "MustSupportDisputeKitClassic",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "NotEligibleForStaking",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "NotEvidencePeriod",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "NotExecutionPeriod",
+          name: "NoRulerSet",
           type: "error",
         },
         {
@@ -16210,47 +16143,17 @@ export default {
         },
         {
           inputs: [],
-          name: "RulingAlreadyExecuted",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "SortitionModuleOnly",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "StakingInTooManyCourts",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "StakingLessThanCourtMinStake",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "StakingMoreThanMaxStakePerJuror",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "StakingMoreThanMaxTotalStaked",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "StakingNotPossibleInThisCourt",
+          name: "RulerOnly",
           type: "error",
         },
         {
           inputs: [],
-          name: "StakingTransferFailed",
+          name: "RulingAlreadyExecuted",
           type: "error",
         },
         {
           inputs: [],
-          name: "StakingZeroWhenNoStake",
+          name: "RulingModeNotSet",
           type: "error",
         },
         {
@@ -16279,41 +16182,11 @@ export default {
           name: "UUPSUnsupportedProxiableUUID",
           type: "error",
         },
-        {
-          inputs: [],
-          name: "UnstakingTransferFailed",
-          type: "error",
-        },
         {
           inputs: [],
           name: "UnsuccessfulCall",
           type: "error",
         },
-        {
-          inputs: [],
-          name: "UnsupportedDisputeKit",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "VotePeriodNotPassed",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "WhenNotPausedOnly",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "WhenPausedOnly",
-          type: "error",
-        },
-        {
-          inputs: [],
-          name: "WrongDisputeKitIndex",
-          type: "error",
-        },
         {
           anonymous: false,
           inputs: [
@@ -16376,60 +16249,42 @@ export default {
           inputs: [
             {
               indexed: true,
-              internalType: "uint96",
-              name: "_courtID",
-              type: "uint96",
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
+              type: "address",
             },
             {
               indexed: true,
-              internalType: "uint96",
-              name: "_parent",
-              type: "uint96",
-            },
-            {
-              indexed: false,
-              internalType: "bool",
-              name: "_hiddenVotes",
-              type: "bool",
+              internalType: "enum KlerosCoreRuler.RulingMode",
+              name: "mode",
+              type: "uint8",
             },
             {
-              indexed: false,
+              indexed: true,
               internalType: "uint256",
-              name: "_minStake",
+              name: "_disputeID",
               type: "uint256",
             },
             {
               indexed: false,
               internalType: "uint256",
-              name: "_alpha",
+              name: "_ruling",
               type: "uint256",
             },
             {
               indexed: false,
-              internalType: "uint256",
-              name: "_feeForJuror",
-              type: "uint256",
+              internalType: "bool",
+              name: "tied",
+              type: "bool",
             },
             {
               indexed: false,
-              internalType: "uint256",
-              name: "_jurorsForCourtJump",
-              type: "uint256",
-            },
-            {
-              indexed: false,
-              internalType: "uint256[4]",
-              name: "_timesPerPeriod",
-              type: "uint256[4]",
-            },
-            {
-              indexed: false,
-              internalType: "uint256[]",
-              name: "_supportedDisputeKits",
-              type: "uint256[]",
+              internalType: "bool",
+              name: "overridden",
+              type: "bool",
             },
           ],
-          name: "CourtCreated",
+          name: "AutoRuled",
           type: "event",
         },
         {
@@ -16438,38 +16293,13 @@ export default {
             {
               indexed: true,
               internalType: "uint256",
-              name: "_disputeID",
-              type: "uint256",
-            },
-            {
-              indexed: true,
-              internalType: "uint256",
-              name: "_roundID",
+              name: "_courtID",
               type: "uint256",
             },
             {
               indexed: true,
               internalType: "uint96",
-              name: "_fromCourtID",
-              type: "uint96",
-            },
-            {
-              indexed: false,
-              internalType: "uint96",
-              name: "_toCourtID",
-              type: "uint96",
-            },
-          ],
-          name: "CourtJump",
-          type: "event",
-        },
-        {
-          anonymous: false,
-          inputs: [
-            {
-              indexed: true,
-              internalType: "uint96",
-              name: "_courtID",
+              name: "_parent",
               type: "uint96",
             },
             {
@@ -16509,7 +16339,7 @@ export default {
               type: "uint256[4]",
             },
           ],
-          name: "CourtModified",
+          name: "CourtCreated",
           type: "event",
         },
         {
@@ -16521,33 +16351,26 @@ export default {
               name: "_disputeID",
               type: "uint256",
             },
-            {
-              indexed: true,
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
-              type: "address",
-            },
-          ],
-          name: "DisputeCreation",
-          type: "event",
-        },
-        {
-          anonymous: false,
-          inputs: [
             {
               indexed: true,
               internalType: "uint256",
-              name: "_disputeKitID",
+              name: "_roundID",
               type: "uint256",
             },
             {
               indexed: true,
-              internalType: "contract IDisputeKit",
-              name: "_disputeKitAddress",
-              type: "address",
+              internalType: "uint96",
+              name: "_fromCourtID",
+              type: "uint96",
+            },
+            {
+              indexed: false,
+              internalType: "uint96",
+              name: "_toCourtID",
+              type: "uint96",
             },
           ],
-          name: "DisputeKitCreated",
+          name: "CourtJump",
           type: "event",
         },
         {
@@ -16560,61 +16383,48 @@ export default {
               type: "uint96",
             },
             {
-              indexed: true,
-              internalType: "uint256",
-              name: "_disputeKitID",
-              type: "uint256",
-            },
-            {
-              indexed: true,
+              indexed: false,
               internalType: "bool",
-              name: "_enable",
+              name: "_hiddenVotes",
               type: "bool",
             },
-          ],
-          name: "DisputeKitEnabled",
-          type: "event",
-        },
-        {
-          anonymous: false,
-          inputs: [
             {
-              indexed: true,
+              indexed: false,
               internalType: "uint256",
-              name: "_disputeID",
+              name: "_minStake",
               type: "uint256",
             },
             {
-              indexed: true,
+              indexed: false,
               internalType: "uint256",
-              name: "_roundID",
+              name: "_alpha",
               type: "uint256",
             },
             {
-              indexed: true,
+              indexed: false,
               internalType: "uint256",
-              name: "_fromDisputeKitID",
+              name: "_feeForJuror",
               type: "uint256",
             },
             {
               indexed: false,
               internalType: "uint256",
-              name: "_toDisputeKitID",
+              name: "_jurorsForCourtJump",
               type: "uint256",
             },
+            {
+              indexed: false,
+              internalType: "uint256[4]",
+              name: "_timesPerPeriod",
+              type: "uint256[4]",
+            },
           ],
-          name: "DisputeKitJump",
+          name: "CourtModified",
           type: "event",
         },
         {
           anonymous: false,
           inputs: [
-            {
-              indexed: true,
-              internalType: "address",
-              name: "_address",
-              type: "address",
-            },
             {
               indexed: true,
               internalType: "uint256",
@@ -16622,19 +16432,13 @@ export default {
               type: "uint256",
             },
             {
-              indexed: false,
-              internalType: "uint256",
-              name: "_roundID",
-              type: "uint256",
-            },
-            {
-              indexed: false,
-              internalType: "uint256",
-              name: "_voteID",
-              type: "uint256",
+              indexed: true,
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
+              type: "address",
             },
           ],
-          name: "Draw",
+          name: "DisputeCreation",
           type: "event",
         },
         {
@@ -16723,7 +16527,7 @@ export default {
             },
             {
               indexed: false,
-              internalType: "enum KlerosCoreBase.Period",
+              internalType: "enum KlerosCoreRuler.Period",
               name: "_period",
               type: "uint8",
             },
@@ -16733,8 +16537,68 @@ export default {
         },
         {
           anonymous: false,
-          inputs: [],
-          name: "Paused",
+          inputs: [
+            {
+              indexed: true,
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
+              type: "address",
+            },
+            {
+              indexed: true,
+              internalType: "address",
+              name: "_oldRuler",
+              type: "address",
+            },
+            {
+              indexed: true,
+              internalType: "address",
+              name: "_newRuler",
+              type: "address",
+            },
+          ],
+          name: "RulerChanged",
+          type: "event",
+        },
+        {
+          anonymous: false,
+          inputs: [
+            {
+              indexed: true,
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
+              type: "address",
+            },
+            {
+              components: [
+                {
+                  internalType: "enum KlerosCoreRuler.RulingMode",
+                  name: "rulingMode",
+                  type: "uint8",
+                },
+                {
+                  internalType: "uint256",
+                  name: "presetRuling",
+                  type: "uint256",
+                },
+                {
+                  internalType: "bool",
+                  name: "presetTied",
+                  type: "bool",
+                },
+                {
+                  internalType: "bool",
+                  name: "presetOverridden",
+                  type: "bool",
+                },
+              ],
+              indexed: false,
+              internalType: "struct KlerosCoreRuler.RulerSettings",
+              name: "_settings",
+              type: "tuple",
+            },
+          ],
+          name: "RulerSettingsChanged",
           type: "event",
         },
         {
@@ -16811,12 +16675,6 @@ export default {
           name: "TokenAndETHShift",
           type: "event",
         },
-        {
-          anonymous: false,
-          inputs: [],
-          name: "Unpaused",
-          type: "event",
-        },
         {
           anonymous: false,
           inputs: [
@@ -16830,19 +16688,6 @@ export default {
           name: "Upgraded",
           type: "event",
         },
-        {
-          inputs: [
-            {
-              internalType: "contract IDisputeKit",
-              name: "_disputeKitAddress",
-              type: "address",
-            },
-          ],
-          name: "addNewDisputeKit",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -16857,9 +16702,14 @@ export default {
             },
             {
               internalType: "bytes",
-              name: "_extraData",
+              name: "",
               type: "bytes",
             },
+            {
+              internalType: "bool",
+              name: "_jump",
+              type: "bool",
+            },
           ],
           name: "appeal",
           outputs: [],
@@ -16873,6 +16723,11 @@ export default {
               name: "_disputeID",
               type: "uint256",
             },
+            {
+              internalType: "bool",
+              name: "_jump",
+              type: "bool",
+            },
           ],
           name: "appealCost",
           outputs: [
@@ -16888,21 +16743,21 @@ export default {
         {
           inputs: [
             {
-              internalType: "uint256",
-              name: "_disputeID",
-              type: "uint256",
+              internalType: "bytes",
+              name: "_extraData",
+              type: "bytes",
             },
-          ],
-          name: "appealPeriod",
-          outputs: [
             {
-              internalType: "uint256",
-              name: "start",
-              type: "uint256",
+              internalType: "contract IERC20",
+              name: "_feeToken",
+              type: "address",
             },
+          ],
+          name: "arbitrationCost",
+          outputs: [
             {
               internalType: "uint256",
-              name: "end",
+              name: "cost",
               type: "uint256",
             },
           ],
@@ -16912,55 +16767,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "address",
-              name: "",
-              type: "address",
+              internalType: "bytes",
+              name: "_extraData",
+              type: "bytes",
             },
           ],
-          name: "arbitrableWhitelist",
-          outputs: [
-            {
-              internalType: "bool",
-              name: "",
-              type: "bool",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "bytes",
-              name: "_extraData",
-              type: "bytes",
-            },
-            {
-              internalType: "contract IERC20",
-              name: "_feeToken",
-              type: "address",
-            },
-          ],
-          name: "arbitrationCost",
-          outputs: [
-            {
-              internalType: "uint256",
-              name: "cost",
-              type: "uint256",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "bytes",
-              name: "_extraData",
-              type: "bytes",
-            },
-          ],
-          name: "arbitrationCost",
+          name: "arbitrationCost",
           outputs: [
             {
               internalType: "uint256",
@@ -16989,24 +16801,6 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
-        {
-          inputs: [
-            {
-              internalType: "address",
-              name: "_arbitrable",
-              type: "address",
-            },
-            {
-              internalType: "bool",
-              name: "_allowed",
-              type: "bool",
-            },
-          ],
-          name: "changeArbitrableWhitelist",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -17089,12 +16883,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "address",
-              name: "_guardian",
+              internalType: "contract IERC20",
+              name: "_pinakion",
               type: "address",
             },
           ],
-          name: "changeGuardian",
+          name: "changePinakion",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -17102,12 +16896,17 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IERC721",
-              name: "_jurorNft",
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
+              type: "address",
+            },
+            {
+              internalType: "address",
+              name: "_newRuler",
               type: "address",
             },
           ],
-          name: "changeJurorNft",
+          name: "changeRuler",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -17115,12 +16914,27 @@ export default {
         {
           inputs: [
             {
-              internalType: "address",
-              name: "_jurorProsecutionModule",
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
               type: "address",
             },
+            {
+              internalType: "uint256",
+              name: "_presetRuling",
+              type: "uint256",
+            },
+            {
+              internalType: "bool",
+              name: "_presetTied",
+              type: "bool",
+            },
+            {
+              internalType: "bool",
+              name: "_presetOverridden",
+              type: "bool",
+            },
           ],
-          name: "changeJurorProsecutionModule",
+          name: "changeRulingModeToAutomaticPreset",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -17128,12 +16942,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IERC20",
-              name: "_pinakion",
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
               type: "address",
             },
           ],
-          name: "changePinakion",
+          name: "changeRulingModeToAutomaticRandom",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -17141,12 +16955,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract ISortitionModule",
-              name: "_sortitionModule",
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
               type: "address",
             },
           ],
-          name: "changeSortitionModule",
+          name: "changeRulingModeToManual",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -17261,16 +17075,6 @@ export default {
               name: "_timesPerPeriod",
               type: "uint256[4]",
             },
-            {
-              internalType: "bytes",
-              name: "_sortitionExtraData",
-              type: "bytes",
-            },
-            {
-              internalType: "uint256[]",
-              name: "_supportedDisputeKits",
-              type: "uint256[]",
-            },
           ],
           name: "createCourt",
           outputs: [],
@@ -17393,25 +17197,6 @@ export default {
           stateMutability: "view",
           type: "function",
         },
-        {
-          inputs: [
-            {
-              internalType: "uint256",
-              name: "",
-              type: "uint256",
-            },
-          ],
-          name: "disputeKits",
-          outputs: [
-            {
-              internalType: "contract IDisputeKit",
-              name: "",
-              type: "address",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -17433,7 +17218,7 @@ export default {
               type: "address",
             },
             {
-              internalType: "enum KlerosCoreBase.Period",
+              internalType: "enum KlerosCoreRuler.Period",
               name: "period",
               type: "uint8",
             },
@@ -17442,62 +17227,10 @@ export default {
               name: "ruled",
               type: "bool",
             },
-            {
-              internalType: "uint256",
-              name: "lastPeriodChange",
-              type: "uint256",
-            },
           ],
           stateMutability: "view",
           type: "function",
         },
-        {
-          inputs: [
-            {
-              internalType: "uint256",
-              name: "_disputeID",
-              type: "uint256",
-            },
-            {
-              internalType: "uint256",
-              name: "_iterations",
-              type: "uint256",
-            },
-          ],
-          name: "draw",
-          outputs: [
-            {
-              internalType: "uint256",
-              name: "nbDrawnJurors",
-              type: "uint256",
-            },
-          ],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "uint96",
-              name: "_courtID",
-              type: "uint96",
-            },
-            {
-              internalType: "uint256[]",
-              name: "_disputeKitIDs",
-              type: "uint256[]",
-            },
-            {
-              internalType: "bool",
-              name: "_enable",
-              type: "bool",
-            },
-          ],
-          name: "enableDisputeKits",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -17510,11 +17243,6 @@ export default {
               name: "_round",
               type: "uint256",
             },
-            {
-              internalType: "uint256",
-              name: "_iterations",
-              type: "uint256",
-            },
           ],
           name: "execute",
           outputs: [],
@@ -17551,6 +17279,21 @@ export default {
               name: "_disputeID",
               type: "uint256",
             },
+            {
+              internalType: "uint256",
+              name: "_ruling",
+              type: "uint256",
+            },
+            {
+              internalType: "bool",
+              name: "tied",
+              type: "bool",
+            },
+            {
+              internalType: "bool",
+              name: "overridden",
+              type: "bool",
+            },
           ],
           name: "executeRuling",
           outputs: [],
@@ -17559,7 +17302,7 @@ export default {
         },
         {
           inputs: [],
-          name: "getDisputeKitsLength",
+          name: "getNextDisputeID",
           outputs: [
             {
               internalType: "uint256",
@@ -17621,12 +17364,29 @@ export default {
               type: "uint256",
             },
           ],
-          name: "getPnkAtStakePerJuror",
+          name: "getRoundInfo",
           outputs: [
             {
-              internalType: "uint256",
+              components: [
+                {
+                  internalType: "uint256",
+                  name: "totalFeesForJurors",
+                  type: "uint256",
+                },
+                {
+                  internalType: "uint256",
+                  name: "sumFeeRewardPaid",
+                  type: "uint256",
+                },
+                {
+                  internalType: "contract IERC20",
+                  name: "feeToken",
+                  type: "address",
+                },
+              ],
+              internalType: "struct KlerosCoreRuler.Round",
               name: "",
-              type: "uint256",
+              type: "tuple",
             },
           ],
           stateMutability: "view",
@@ -17635,93 +17395,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "uint256",
-              name: "_disputeID",
-              type: "uint256",
-            },
-            {
-              internalType: "uint256",
-              name: "_round",
-              type: "uint256",
+              internalType: "uint96",
+              name: "_courtID",
+              type: "uint96",
             },
           ],
-          name: "getRoundInfo",
-          outputs: [
-            {
-              components: [
-                {
-                  internalType: "uint256",
-                  name: "disputeKitID",
-                  type: "uint256",
-                },
-                {
-                  internalType: "uint256",
-                  name: "pnkAtStakePerJuror",
-                  type: "uint256",
-                },
-                {
-                  internalType: "uint256",
-                  name: "totalFeesForJurors",
-                  type: "uint256",
-                },
-                {
-                  internalType: "uint256",
-                  name: "nbVotes",
-                  type: "uint256",
-                },
-                {
-                  internalType: "uint256",
-                  name: "repartitions",
-                  type: "uint256",
-                },
-                {
-                  internalType: "uint256",
-                  name: "pnkPenalties",
-                  type: "uint256",
-                },
-                {
-                  internalType: "address[]",
-                  name: "drawnJurors",
-                  type: "address[]",
-                },
-                {
-                  internalType: "uint256",
-                  name: "sumFeeRewardPaid",
-                  type: "uint256",
-                },
-                {
-                  internalType: "uint256",
-                  name: "sumPnkRewardPaid",
-                  type: "uint256",
-                },
-                {
-                  internalType: "contract IERC20",
-                  name: "feeToken",
-                  type: "address",
-                },
-                {
-                  internalType: "uint256",
-                  name: "drawIterations",
-                  type: "uint256",
-                },
-              ],
-              internalType: "struct KlerosCoreBase.Round",
-              name: "",
-              type: "tuple",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "uint96",
-              name: "_courtID",
-              type: "uint96",
-            },
-          ],
-          name: "getTimesPerPeriod",
+          name: "getTimesPerPeriod",
           outputs: [
             {
               internalType: "uint256[4]",
@@ -17745,19 +17424,6 @@ export default {
           stateMutability: "view",
           type: "function",
         },
-        {
-          inputs: [],
-          name: "guardian",
-          outputs: [
-            {
-              internalType: "address",
-              name: "",
-              type: "address",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
         {
           inputs: [
             {
@@ -17765,61 +17431,16 @@ export default {
               name: "_governor",
               type: "address",
             },
-            {
-              internalType: "address",
-              name: "_guardian",
-              type: "address",
-            },
             {
               internalType: "contract IERC20",
               name: "_pinakion",
               type: "address",
             },
-            {
-              internalType: "address",
-              name: "_jurorProsecutionModule",
-              type: "address",
-            },
-            {
-              internalType: "contract IDisputeKit",
-              name: "_disputeKit",
-              type: "address",
-            },
-            {
-              internalType: "bool",
-              name: "_hiddenVotes",
-              type: "bool",
-            },
             {
               internalType: "uint256[4]",
               name: "_courtParameters",
               type: "uint256[4]",
             },
-            {
-              internalType: "uint256[4]",
-              name: "_timesPerPeriod",
-              type: "uint256[4]",
-            },
-            {
-              internalType: "bytes",
-              name: "_sortitionExtraData",
-              type: "bytes",
-            },
-            {
-              internalType: "contract ISortitionModule",
-              name: "_sortitionModuleAddress",
-              type: "address",
-            },
-            {
-              internalType: "contract IERC721",
-              name: "_jurorNft",
-              type: "address",
-            },
-            {
-              internalType: "address",
-              name: "_wNative",
-              type: "address",
-            },
           ],
           name: "initialize",
           outputs: [],
@@ -17827,68 +17448,44 @@ export default {
           type: "function",
         },
         {
-          inputs: [
-            {
-              internalType: "uint256",
-              name: "_disputeID",
-              type: "uint256",
-            },
-          ],
-          name: "isDisputeKitJumping",
+          inputs: [],
+          name: "pinakion",
           outputs: [
             {
-              internalType: "bool",
+              internalType: "contract IERC20",
               name: "",
-              type: "bool",
+              type: "address",
             },
           ],
           stateMutability: "view",
           type: "function",
         },
         {
-          inputs: [
-            {
-              internalType: "uint96",
-              name: "_courtID",
-              type: "uint96",
-            },
-            {
-              internalType: "uint256",
-              name: "_disputeKitID",
-              type: "uint256",
-            },
-          ],
-          name: "isSupported",
+          inputs: [],
+          name: "proxiableUUID",
           outputs: [
             {
-              internalType: "bool",
+              internalType: "bytes32",
               name: "",
-              type: "bool",
+              type: "bytes32",
             },
           ],
           stateMutability: "view",
           type: "function",
         },
         {
-          inputs: [],
-          name: "jurorNft",
-          outputs: [
+          inputs: [
             {
-              internalType: "contract IERC721",
-              name: "",
+              internalType: "contract IArbitrableV2",
+              name: "arbitrable",
               type: "address",
             },
           ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "jurorProsecutionModule",
+          name: "rulers",
           outputs: [
             {
               internalType: "address",
-              name: "",
+              name: "ruler",
               type: "address",
             },
           ],
@@ -17899,56 +17496,26 @@ export default {
           inputs: [
             {
               internalType: "uint256",
-              name: "_disputeID",
+              name: "disputeID",
               type: "uint256",
             },
           ],
-          name: "passPeriod",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "pause",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "paused",
+          name: "rulingResults",
           outputs: [
             {
-              internalType: "bool",
-              name: "",
-              type: "bool",
+              internalType: "uint256",
+              name: "ruling",
+              type: "uint256",
             },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "pinakion",
-          outputs: [
             {
-              internalType: "contract IERC20",
-              name: "",
-              type: "address",
+              internalType: "bool",
+              name: "tied",
+              type: "bool",
             },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "proxiableUUID",
-          outputs: [
             {
-              internalType: "bytes32",
-              name: "",
-              type: "bytes32",
+              internalType: "bool",
+              name: "overridden",
+              type: "bool",
             },
           ],
           stateMutability: "view",
@@ -17957,93 +17524,35 @@ export default {
         {
           inputs: [
             {
-              internalType: "address",
-              name: "_wNative",
-              type: "address",
-            },
-          ],
-          name: "reinitialize",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "uint96",
-              name: "_courtID",
-              type: "uint96",
-            },
-            {
-              internalType: "uint256",
-              name: "_newStake",
-              type: "uint256",
-            },
-          ],
-          name: "setStake",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "address",
-              name: "_account",
+              internalType: "contract IArbitrableV2",
+              name: "arbitrable",
               type: "address",
             },
-            {
-              internalType: "uint96",
-              name: "_courtID",
-              type: "uint96",
-            },
-            {
-              internalType: "uint256",
-              name: "_newStake",
-              type: "uint256",
-            },
           ],
-          name: "setStakeBySortitionModule",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "sortitionModule",
+          name: "settings",
           outputs: [
             {
-              internalType: "contract ISortitionModule",
-              name: "",
-              type: "address",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [
-            {
-              internalType: "address",
-              name: "_account",
-              type: "address",
+              internalType: "enum KlerosCoreRuler.RulingMode",
+              name: "rulingMode",
+              type: "uint8",
             },
             {
               internalType: "uint256",
-              name: "_amount",
+              name: "presetRuling",
               type: "uint256",
             },
-          ],
-          name: "transferBySortitionModule",
-          outputs: [],
-          stateMutability: "nonpayable",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "unpause",
-          outputs: [],
-          stateMutability: "nonpayable",
+            {
+              internalType: "bool",
+              name: "presetTied",
+              type: "bool",
+            },
+            {
+              internalType: "bool",
+              name: "presetOverridden",
+              type: "bool",
+            },
+          ],
+          stateMutability: "view",
           type: "function",
         },
         {
@@ -18064,37 +17573,6 @@ export default {
           stateMutability: "payable",
           type: "function",
         },
-        {
-          inputs: [],
-          name: "version",
-          outputs: [
-            {
-              internalType: "string",
-              name: "",
-              type: "string",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "wNative",
-          outputs: [
-            {
-              internalType: "address",
-              name: "",
-              type: "address",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-      ],
-    },
-    KlerosCoreNeo_Proxy: {
-      address: "0x991d2df165670b9cac3B022f4B68D65b664222ea",
-      abi: [
         {
           inputs: [
             {
@@ -18111,26 +17589,15 @@ export default {
           stateMutability: "nonpayable",
           type: "constructor",
         },
-        {
-          stateMutability: "payable",
-          type: "fallback",
-        },
-        {
-          stateMutability: "payable",
-          type: "receive",
-        },
       ],
     },
-    KlerosCoreRulerNeo: {
-      address: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
+    KlerosCoreRuler_Implementation: {
+      address: "0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324",
       abi: [
         {
-          stateMutability: "payable",
-          type: "fallback",
-        },
-        {
-          stateMutability: "payable",
-          type: "receive",
+          inputs: [],
+          stateMutability: "nonpayable",
+          type: "constructor",
         },
         {
           inputs: [],
@@ -19625,50 +19092,239 @@ export default {
           stateMutability: "payable",
           type: "function",
         },
+      ],
+    },
+    KlerosCoreRuler_Proxy: {
+      address: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
+      abi: [
+        {
+          inputs: [
+            {
+              internalType: "address",
+              name: "_implementation",
+              type: "address",
+            },
+            {
+              internalType: "bytes",
+              name: "_data",
+              type: "bytes",
+            },
+          ],
+          stateMutability: "nonpayable",
+          type: "constructor",
+        },
+        {
+          stateMutability: "payable",
+          type: "fallback",
+        },
+        {
+          stateMutability: "payable",
+          type: "receive",
+        },
+      ],
+    },
+    KlerosCoreSnapshotProxy: {
+      address: "0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95",
+      abi: [
+        {
+          inputs: [
+            {
+              internalType: "address",
+              name: "_governor",
+              type: "address",
+            },
+            {
+              internalType: "contract IKlerosCore",
+              name: "_core",
+              type: "address",
+            },
+          ],
+          stateMutability: "nonpayable",
+          type: "constructor",
+        },
+        {
+          inputs: [
+            {
+              internalType: "address",
+              name: "_account",
+              type: "address",
+            },
+          ],
+          name: "balanceOf",
+          outputs: [
+            {
+              internalType: "uint256",
+              name: "totalStaked",
+              type: "uint256",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [
+            {
+              internalType: "contract IKlerosCore",
+              name: "_core",
+              type: "address",
+            },
+          ],
+          name: "changeCore",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
+        {
+          inputs: [
+            {
+              internalType: "address",
+              name: "_governor",
+              type: "address",
+            },
+          ],
+          name: "changeGovernor",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "core",
+          outputs: [
+            {
+              internalType: "contract IKlerosCore",
+              name: "",
+              type: "address",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "decimals",
+          outputs: [
+            {
+              internalType: "uint8",
+              name: "",
+              type: "uint8",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "governor",
+          outputs: [
+            {
+              internalType: "address",
+              name: "",
+              type: "address",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "name",
+          outputs: [
+            {
+              internalType: "string",
+              name: "",
+              type: "string",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "symbol",
+          outputs: [
+            {
+              internalType: "string",
+              name: "",
+              type: "string",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+      ],
+    },
+    KlerosCore_Implementation: {
+      address: "0xC1210493804eEF123096F9581Ee82B915150E54c",
+      abi: [
+        {
+          inputs: [],
+          stateMutability: "nonpayable",
+          type: "constructor",
+        },
+        {
+          inputs: [],
+          name: "AlreadyInitialized",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "AppealFeesNotEnough",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "AppealPeriodNotPassed",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "ArbitrableNotWhitelisted",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "ArbitrationFeesNotEnough",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "CannotDisableClassicDK",
+          type: "error",
+        },
         {
-          inputs: [
-            {
-              internalType: "address",
-              name: "_implementation",
-              type: "address",
-            },
-            {
-              internalType: "bytes",
-              name: "_data",
-              type: "bytes",
-            },
-          ],
-          stateMutability: "nonpayable",
-          type: "constructor",
+          inputs: [],
+          name: "CommitPeriodNotPassed",
+          type: "error",
         },
-      ],
-    },
-    KlerosCoreRulerNeo_Implementation: {
-      address: "0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324",
-      abi: [
         {
           inputs: [],
-          stateMutability: "nonpayable",
-          type: "constructor",
+          name: "DisputeKitNotSupportedByCourt",
+          type: "error",
         },
         {
           inputs: [],
-          name: "AlreadyInitialized",
+          name: "DisputeKitOnly",
           type: "error",
         },
         {
           inputs: [],
-          name: "AppealFeesNotEnough",
+          name: "DisputeNotAppealable",
           type: "error",
         },
         {
           inputs: [],
-          name: "ArbitrationFeesNotEnough",
+          name: "DisputePeriodIsFinal",
           type: "error",
         },
         {
           inputs: [],
-          name: "DisputeNotAppealable",
+          name: "DisputeStillDrawing",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "EvidenceNotPassedAndNotAppeal",
           type: "error",
         },
         {
@@ -19683,7 +19339,12 @@ export default {
         },
         {
           inputs: [],
-          name: "GovernorOrInstructorOnly",
+          name: "GuardianOrGovernorOnly",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "InvalidDisputKitParent",
           type: "error",
         },
         {
@@ -19704,17 +19365,32 @@ export default {
         },
         {
           inputs: [],
-          name: "NoRulerSet",
+          name: "MinStakeLowerThanParentCourt",
           type: "error",
         },
         {
           inputs: [],
-          name: "NotInitializing",
+          name: "MustSupportDisputeKitClassic",
           type: "error",
         },
         {
           inputs: [],
-          name: "RulerOnly",
+          name: "NotEligibleForStaking",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "NotEvidencePeriod",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "NotExecutionPeriod",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "NotInitializing",
           type: "error",
         },
         {
@@ -19724,7 +19400,42 @@ export default {
         },
         {
           inputs: [],
-          name: "RulingModeNotSet",
+          name: "SortitionModuleOnly",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingInTooManyCourts",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingLessThanCourtMinStake",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingMoreThanMaxStakePerJuror",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingMoreThanMaxTotalStaked",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingNotPossibleInThisCourt",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingTransferFailed",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "StakingZeroWhenNoStake",
           type: "error",
         },
         {
@@ -19753,11 +19464,41 @@ export default {
           name: "UUPSUnsupportedProxiableUUID",
           type: "error",
         },
+        {
+          inputs: [],
+          name: "UnstakingTransferFailed",
+          type: "error",
+        },
         {
           inputs: [],
           name: "UnsuccessfulCall",
           type: "error",
         },
+        {
+          inputs: [],
+          name: "UnsupportedDisputeKit",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "VotePeriodNotPassed",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "WhenNotPausedOnly",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "WhenPausedOnly",
+          type: "error",
+        },
+        {
+          inputs: [],
+          name: "WrongDisputeKitIndex",
+          type: "error",
+        },
         {
           anonymous: false,
           inputs: [
@@ -19820,42 +19561,60 @@ export default {
           inputs: [
             {
               indexed: true,
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
-              type: "address",
+              internalType: "uint96",
+              name: "_courtID",
+              type: "uint96",
             },
             {
               indexed: true,
-              internalType: "enum KlerosCoreRuler.RulingMode",
-              name: "mode",
-              type: "uint8",
+              internalType: "uint96",
+              name: "_parent",
+              type: "uint96",
             },
             {
-              indexed: true,
+              indexed: false,
+              internalType: "bool",
+              name: "_hiddenVotes",
+              type: "bool",
+            },
+            {
+              indexed: false,
               internalType: "uint256",
-              name: "_disputeID",
+              name: "_minStake",
               type: "uint256",
             },
             {
               indexed: false,
               internalType: "uint256",
-              name: "_ruling",
+              name: "_alpha",
               type: "uint256",
             },
             {
               indexed: false,
-              internalType: "bool",
-              name: "tied",
-              type: "bool",
+              internalType: "uint256",
+              name: "_feeForJuror",
+              type: "uint256",
             },
             {
               indexed: false,
-              internalType: "bool",
-              name: "overridden",
-              type: "bool",
+              internalType: "uint256",
+              name: "_jurorsForCourtJump",
+              type: "uint256",
+            },
+            {
+              indexed: false,
+              internalType: "uint256[4]",
+              name: "_timesPerPeriod",
+              type: "uint256[4]",
+            },
+            {
+              indexed: false,
+              internalType: "uint256[]",
+              name: "_supportedDisputeKits",
+              type: "uint256[]",
             },
           ],
-          name: "AutoRuled",
+          name: "CourtCreated",
           type: "event",
         },
         {
@@ -19864,13 +19623,38 @@ export default {
             {
               indexed: true,
               internalType: "uint256",
-              name: "_courtID",
+              name: "_disputeID",
+              type: "uint256",
+            },
+            {
+              indexed: true,
+              internalType: "uint256",
+              name: "_roundID",
               type: "uint256",
             },
             {
               indexed: true,
               internalType: "uint96",
-              name: "_parent",
+              name: "_fromCourtID",
+              type: "uint96",
+            },
+            {
+              indexed: false,
+              internalType: "uint96",
+              name: "_toCourtID",
+              type: "uint96",
+            },
+          ],
+          name: "CourtJump",
+          type: "event",
+        },
+        {
+          anonymous: false,
+          inputs: [
+            {
+              indexed: true,
+              internalType: "uint96",
+              name: "_courtID",
               type: "uint96",
             },
             {
@@ -19910,7 +19694,7 @@ export default {
               type: "uint256[4]",
             },
           ],
-          name: "CourtCreated",
+          name: "CourtModified",
           type: "event",
         },
         {
@@ -19924,24 +19708,31 @@ export default {
             },
             {
               indexed: true,
-              internalType: "uint256",
-              name: "_roundID",
-              type: "uint256",
+              internalType: "contract IArbitrableV2",
+              name: "_arbitrable",
+              type: "address",
             },
+          ],
+          name: "DisputeCreation",
+          type: "event",
+        },
+        {
+          anonymous: false,
+          inputs: [
             {
               indexed: true,
-              internalType: "uint96",
-              name: "_fromCourtID",
-              type: "uint96",
+              internalType: "uint256",
+              name: "_disputeKitID",
+              type: "uint256",
             },
             {
-              indexed: false,
-              internalType: "uint96",
-              name: "_toCourtID",
-              type: "uint96",
+              indexed: true,
+              internalType: "contract IDisputeKit",
+              name: "_disputeKitAddress",
+              type: "address",
             },
           ],
-          name: "CourtJump",
+          name: "DisputeKitCreated",
           type: "event",
         },
         {
@@ -19954,48 +19745,61 @@ export default {
               type: "uint96",
             },
             {
-              indexed: false,
+              indexed: true,
+              internalType: "uint256",
+              name: "_disputeKitID",
+              type: "uint256",
+            },
+            {
+              indexed: true,
               internalType: "bool",
-              name: "_hiddenVotes",
+              name: "_enable",
               type: "bool",
             },
+          ],
+          name: "DisputeKitEnabled",
+          type: "event",
+        },
+        {
+          anonymous: false,
+          inputs: [
             {
-              indexed: false,
+              indexed: true,
               internalType: "uint256",
-              name: "_minStake",
+              name: "_disputeID",
               type: "uint256",
             },
             {
-              indexed: false,
+              indexed: true,
               internalType: "uint256",
-              name: "_alpha",
+              name: "_roundID",
               type: "uint256",
             },
             {
-              indexed: false,
+              indexed: true,
               internalType: "uint256",
-              name: "_feeForJuror",
+              name: "_fromDisputeKitID",
               type: "uint256",
             },
             {
               indexed: false,
               internalType: "uint256",
-              name: "_jurorsForCourtJump",
+              name: "_toDisputeKitID",
               type: "uint256",
             },
-            {
-              indexed: false,
-              internalType: "uint256[4]",
-              name: "_timesPerPeriod",
-              type: "uint256[4]",
-            },
           ],
-          name: "CourtModified",
+          name: "DisputeKitJump",
           type: "event",
         },
         {
           anonymous: false,
           inputs: [
+            {
+              indexed: true,
+              internalType: "address",
+              name: "_address",
+              type: "address",
+            },
             {
               indexed: true,
               internalType: "uint256",
@@ -20003,13 +19807,19 @@ export default {
               type: "uint256",
             },
             {
-              indexed: true,
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
-              type: "address",
+              indexed: false,
+              internalType: "uint256",
+              name: "_roundID",
+              type: "uint256",
+            },
+            {
+              indexed: false,
+              internalType: "uint256",
+              name: "_voteID",
+              type: "uint256",
             },
           ],
-          name: "DisputeCreation",
+          name: "Draw",
           type: "event",
         },
         {
@@ -20098,7 +19908,7 @@ export default {
             },
             {
               indexed: false,
-              internalType: "enum KlerosCoreRuler.Period",
+              internalType: "enum KlerosCoreBase.Period",
               name: "_period",
               type: "uint8",
             },
@@ -20108,68 +19918,8 @@ export default {
         },
         {
           anonymous: false,
-          inputs: [
-            {
-              indexed: true,
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
-              type: "address",
-            },
-            {
-              indexed: true,
-              internalType: "address",
-              name: "_oldRuler",
-              type: "address",
-            },
-            {
-              indexed: true,
-              internalType: "address",
-              name: "_newRuler",
-              type: "address",
-            },
-          ],
-          name: "RulerChanged",
-          type: "event",
-        },
-        {
-          anonymous: false,
-          inputs: [
-            {
-              indexed: true,
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
-              type: "address",
-            },
-            {
-              components: [
-                {
-                  internalType: "enum KlerosCoreRuler.RulingMode",
-                  name: "rulingMode",
-                  type: "uint8",
-                },
-                {
-                  internalType: "uint256",
-                  name: "presetRuling",
-                  type: "uint256",
-                },
-                {
-                  internalType: "bool",
-                  name: "presetTied",
-                  type: "bool",
-                },
-                {
-                  internalType: "bool",
-                  name: "presetOverridden",
-                  type: "bool",
-                },
-              ],
-              indexed: false,
-              internalType: "struct KlerosCoreRuler.RulerSettings",
-              name: "_settings",
-              type: "tuple",
-            },
-          ],
-          name: "RulerSettingsChanged",
+          inputs: [],
+          name: "Paused",
           type: "event",
         },
         {
@@ -20246,6 +19996,12 @@ export default {
           name: "TokenAndETHShift",
           type: "event",
         },
+        {
+          anonymous: false,
+          inputs: [],
+          name: "Unpaused",
+          type: "event",
+        },
         {
           anonymous: false,
           inputs: [
@@ -20259,6 +20015,19 @@ export default {
           name: "Upgraded",
           type: "event",
         },
+        {
+          inputs: [
+            {
+              internalType: "contract IDisputeKit",
+              name: "_disputeKitAddress",
+              type: "address",
+            },
+          ],
+          name: "addNewDisputeKit",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -20273,14 +20042,9 @@ export default {
             },
             {
               internalType: "bytes",
-              name: "",
+              name: "_extraData",
               type: "bytes",
             },
-            {
-              internalType: "bool",
-              name: "_jump",
-              type: "bool",
-            },
           ],
           name: "appeal",
           outputs: [],
@@ -20294,11 +20058,6 @@ export default {
               name: "_disputeID",
               type: "uint256",
             },
-            {
-              internalType: "bool",
-              name: "_jump",
-              type: "bool",
-            },
           ],
           name: "appealCost",
           outputs: [
@@ -20311,6 +20070,49 @@ export default {
           stateMutability: "view",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "_disputeID",
+              type: "uint256",
+            },
+          ],
+          name: "appealPeriod",
+          outputs: [
+            {
+              internalType: "uint256",
+              name: "start",
+              type: "uint256",
+            },
+            {
+              internalType: "uint256",
+              name: "end",
+              type: "uint256",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [
+            {
+              internalType: "address",
+              name: "",
+              type: "address",
+            },
+          ],
+          name: "arbitrableWhitelist",
+          outputs: [
+            {
+              internalType: "bool",
+              name: "",
+              type: "bool",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -20372,6 +20174,24 @@ export default {
           stateMutability: "nonpayable",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "address",
+              name: "_arbitrable",
+              type: "address",
+            },
+            {
+              internalType: "bool",
+              name: "_allowed",
+              type: "bool",
+            },
+          ],
+          name: "changeArbitrableWhitelist",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -20454,12 +20274,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IERC20",
-              name: "_pinakion",
+              internalType: "address",
+              name: "_guardian",
               type: "address",
             },
           ],
-          name: "changePinakion",
+          name: "changeGuardian",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -20467,17 +20287,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
-              type: "address",
-            },
-            {
-              internalType: "address",
-              name: "_newRuler",
+              internalType: "contract IERC721",
+              name: "_jurorNft",
               type: "address",
             },
           ],
-          name: "changeRuler",
+          name: "changeJurorNft",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -20485,27 +20300,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
+              internalType: "address",
+              name: "_jurorProsecutionModule",
               type: "address",
             },
-            {
-              internalType: "uint256",
-              name: "_presetRuling",
-              type: "uint256",
-            },
-            {
-              internalType: "bool",
-              name: "_presetTied",
-              type: "bool",
-            },
-            {
-              internalType: "bool",
-              name: "_presetOverridden",
-              type: "bool",
-            },
           ],
-          name: "changeRulingModeToAutomaticPreset",
+          name: "changeJurorProsecutionModule",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -20513,12 +20313,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
+              internalType: "contract IERC20",
+              name: "_pinakion",
               type: "address",
             },
           ],
-          name: "changeRulingModeToAutomaticRandom",
+          name: "changePinakion",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -20526,12 +20326,12 @@ export default {
         {
           inputs: [
             {
-              internalType: "contract IArbitrableV2",
-              name: "_arbitrable",
+              internalType: "contract ISortitionModule",
+              name: "_sortitionModule",
               type: "address",
             },
           ],
-          name: "changeRulingModeToManual",
+          name: "changeSortitionModule",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -20646,6 +20446,16 @@ export default {
               name: "_timesPerPeriod",
               type: "uint256[4]",
             },
+            {
+              internalType: "bytes",
+              name: "_sortitionExtraData",
+              type: "bytes",
+            },
+            {
+              internalType: "uint256[]",
+              name: "_supportedDisputeKits",
+              type: "uint256[]",
+            },
           ],
           name: "createCourt",
           outputs: [],
@@ -20768,6 +20578,25 @@ export default {
           stateMutability: "view",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "",
+              type: "uint256",
+            },
+          ],
+          name: "disputeKits",
+          outputs: [
+            {
+              internalType: "contract IDisputeKit",
+              name: "",
+              type: "address",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -20789,7 +20618,7 @@ export default {
               type: "address",
             },
             {
-              internalType: "enum KlerosCoreRuler.Period",
+              internalType: "enum KlerosCoreBase.Period",
               name: "period",
               type: "uint8",
             },
@@ -20798,10 +20627,62 @@ export default {
               name: "ruled",
               type: "bool",
             },
+            {
+              internalType: "uint256",
+              name: "lastPeriodChange",
+              type: "uint256",
+            },
           ],
           stateMutability: "view",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "_disputeID",
+              type: "uint256",
+            },
+            {
+              internalType: "uint256",
+              name: "_iterations",
+              type: "uint256",
+            },
+          ],
+          name: "draw",
+          outputs: [
+            {
+              internalType: "uint256",
+              name: "nbDrawnJurors",
+              type: "uint256",
+            },
+          ],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
+        {
+          inputs: [
+            {
+              internalType: "uint96",
+              name: "_courtID",
+              type: "uint96",
+            },
+            {
+              internalType: "uint256[]",
+              name: "_disputeKitIDs",
+              type: "uint256[]",
+            },
+            {
+              internalType: "bool",
+              name: "_enable",
+              type: "bool",
+            },
+          ],
+          name: "enableDisputeKits",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -20814,6 +20695,11 @@ export default {
               name: "_round",
               type: "uint256",
             },
+            {
+              internalType: "uint256",
+              name: "_iterations",
+              type: "uint256",
+            },
           ],
           name: "execute",
           outputs: [],
@@ -20850,21 +20736,6 @@ export default {
               name: "_disputeID",
               type: "uint256",
             },
-            {
-              internalType: "uint256",
-              name: "_ruling",
-              type: "uint256",
-            },
-            {
-              internalType: "bool",
-              name: "tied",
-              type: "bool",
-            },
-            {
-              internalType: "bool",
-              name: "overridden",
-              type: "bool",
-            },
           ],
           name: "executeRuling",
           outputs: [],
@@ -20873,7 +20744,7 @@ export default {
         },
         {
           inputs: [],
-          name: "getNextDisputeID",
+          name: "getDisputeKitsLength",
           outputs: [
             {
               internalType: "uint256",
@@ -20922,6 +20793,30 @@ export default {
           stateMutability: "view",
           type: "function",
         },
+        {
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "_disputeID",
+              type: "uint256",
+            },
+            {
+              internalType: "uint256",
+              name: "_round",
+              type: "uint256",
+            },
+          ],
+          name: "getPnkAtStakePerJuror",
+          outputs: [
+            {
+              internalType: "uint256",
+              name: "",
+              type: "uint256",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -20939,23 +20834,63 @@ export default {
           outputs: [
             {
               components: [
+                {
+                  internalType: "uint256",
+                  name: "disputeKitID",
+                  type: "uint256",
+                },
+                {
+                  internalType: "uint256",
+                  name: "pnkAtStakePerJuror",
+                  type: "uint256",
+                },
                 {
                   internalType: "uint256",
                   name: "totalFeesForJurors",
                   type: "uint256",
                 },
+                {
+                  internalType: "uint256",
+                  name: "nbVotes",
+                  type: "uint256",
+                },
+                {
+                  internalType: "uint256",
+                  name: "repartitions",
+                  type: "uint256",
+                },
+                {
+                  internalType: "uint256",
+                  name: "pnkPenalties",
+                  type: "uint256",
+                },
+                {
+                  internalType: "address[]",
+                  name: "drawnJurors",
+                  type: "address[]",
+                },
                 {
                   internalType: "uint256",
                   name: "sumFeeRewardPaid",
                   type: "uint256",
                 },
+                {
+                  internalType: "uint256",
+                  name: "sumPnkRewardPaid",
+                  type: "uint256",
+                },
                 {
                   internalType: "contract IERC20",
                   name: "feeToken",
                   type: "address",
                 },
+                {
+                  internalType: "uint256",
+                  name: "drawIterations",
+                  type: "uint256",
+                },
               ],
-              internalType: "struct KlerosCoreRuler.Round",
+              internalType: "struct KlerosCoreBase.Round",
               name: "",
               type: "tuple",
             },
@@ -20995,6 +20930,19 @@ export default {
           stateMutability: "view",
           type: "function",
         },
+        {
+          inputs: [],
+          name: "guardian",
+          outputs: [
+            {
+              internalType: "address",
+              name: "",
+              type: "address",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
         {
           inputs: [
             {
@@ -21002,16 +20950,61 @@ export default {
               name: "_governor",
               type: "address",
             },
+            {
+              internalType: "address",
+              name: "_guardian",
+              type: "address",
+            },
             {
               internalType: "contract IERC20",
               name: "_pinakion",
               type: "address",
             },
+            {
+              internalType: "address",
+              name: "_jurorProsecutionModule",
+              type: "address",
+            },
+            {
+              internalType: "contract IDisputeKit",
+              name: "_disputeKit",
+              type: "address",
+            },
+            {
+              internalType: "bool",
+              name: "_hiddenVotes",
+              type: "bool",
+            },
             {
               internalType: "uint256[4]",
               name: "_courtParameters",
               type: "uint256[4]",
             },
+            {
+              internalType: "uint256[4]",
+              name: "_timesPerPeriod",
+              type: "uint256[4]",
+            },
+            {
+              internalType: "bytes",
+              name: "_sortitionExtraData",
+              type: "bytes",
+            },
+            {
+              internalType: "contract ISortitionModule",
+              name: "_sortitionModuleAddress",
+              type: "address",
+            },
+            {
+              internalType: "contract IERC721",
+              name: "_jurorNft",
+              type: "address",
+            },
+            {
+              internalType: "address",
+              name: "_wNative",
+              type: "address",
+            },
           ],
           name: "initialize",
           outputs: [],
@@ -21019,13 +21012,43 @@ export default {
           type: "function",
         },
         {
-          inputs: [],
-          name: "pinakion",
+          inputs: [
+            {
+              internalType: "uint256",
+              name: "_disputeID",
+              type: "uint256",
+            },
+          ],
+          name: "isDisputeKitJumping",
+          outputs: [
+            {
+              internalType: "bool",
+              name: "",
+              type: "bool",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [
+            {
+              internalType: "uint96",
+              name: "_courtID",
+              type: "uint96",
+            },
+            {
+              internalType: "uint256",
+              name: "_disputeKitID",
+              type: "uint256",
+            },
+          ],
+          name: "isSupported",
           outputs: [
             {
-              internalType: "contract IERC20",
+              internalType: "bool",
               name: "",
-              type: "address",
+              type: "bool",
             },
           ],
           stateMutability: "view",
@@ -21033,30 +21056,24 @@ export default {
         },
         {
           inputs: [],
-          name: "proxiableUUID",
+          name: "jurorNft",
           outputs: [
             {
-              internalType: "bytes32",
+              internalType: "contract IERC721",
               name: "",
-              type: "bytes32",
+              type: "address",
             },
           ],
           stateMutability: "view",
           type: "function",
         },
         {
-          inputs: [
-            {
-              internalType: "contract IArbitrableV2",
-              name: "arbitrable",
-              type: "address",
-            },
-          ],
-          name: "rulers",
+          inputs: [],
+          name: "jurorProsecutionModule",
           outputs: [
             {
               internalType: "address",
-              name: "ruler",
+              name: "",
               type: "address",
             },
           ],
@@ -21067,25 +21084,29 @@ export default {
           inputs: [
             {
               internalType: "uint256",
-              name: "disputeID",
+              name: "_disputeID",
               type: "uint256",
             },
           ],
-          name: "rulingResults",
+          name: "passPeriod",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "pause",
+          outputs: [],
+          stateMutability: "nonpayable",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "paused",
           outputs: [
-            {
-              internalType: "uint256",
-              name: "ruling",
-              type: "uint256",
-            },
-            {
-              internalType: "bool",
-              name: "tied",
-              type: "bool",
-            },
             {
               internalType: "bool",
-              name: "overridden",
+              name: "",
               type: "bool",
             },
           ],
@@ -21093,34 +21114,26 @@ export default {
           type: "function",
         },
         {
-          inputs: [
+          inputs: [],
+          name: "pinakion",
+          outputs: [
             {
-              internalType: "contract IArbitrableV2",
-              name: "arbitrable",
+              internalType: "contract IERC20",
+              name: "",
               type: "address",
             },
           ],
-          name: "settings",
+          stateMutability: "view",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "proxiableUUID",
           outputs: [
             {
-              internalType: "enum KlerosCoreRuler.RulingMode",
-              name: "rulingMode",
-              type: "uint8",
-            },
-            {
-              internalType: "uint256",
-              name: "presetRuling",
-              type: "uint256",
-            },
-            {
-              internalType: "bool",
-              name: "presetTied",
-              type: "bool",
-            },
-            {
-              internalType: "bool",
-              name: "presetOverridden",
-              type: "bool",
+              internalType: "bytes32",
+              name: "",
+              type: "bytes32",
             },
           ],
           stateMutability: "view",
@@ -21130,69 +21143,68 @@ export default {
           inputs: [
             {
               internalType: "address",
-              name: "newImplementation",
+              name: "_wNative",
               type: "address",
             },
-            {
-              internalType: "bytes",
-              name: "data",
-              type: "bytes",
-            },
           ],
-          name: "upgradeToAndCall",
+          name: "reinitialize",
           outputs: [],
-          stateMutability: "payable",
+          stateMutability: "nonpayable",
           type: "function",
         },
-      ],
-    },
-    KlerosCoreRulerNeo_Proxy: {
-      address: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
-      abi: [
         {
           inputs: [
             {
-              internalType: "address",
-              name: "_implementation",
-              type: "address",
+              internalType: "uint96",
+              name: "_courtID",
+              type: "uint96",
             },
             {
-              internalType: "bytes",
-              name: "_data",
-              type: "bytes",
+              internalType: "uint256",
+              name: "_newStake",
+              type: "uint256",
             },
           ],
+          name: "setStake",
+          outputs: [],
           stateMutability: "nonpayable",
-          type: "constructor",
-        },
-        {
-          stateMutability: "payable",
-          type: "fallback",
-        },
-        {
-          stateMutability: "payable",
-          type: "receive",
+          type: "function",
         },
-      ],
-    },
-    KlerosCoreSnapshotProxy: {
-      address: "0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95",
-      abi: [
         {
           inputs: [
             {
               internalType: "address",
-              name: "_governor",
+              name: "_account",
               type: "address",
             },
             {
-              internalType: "contract IKlerosCore",
-              name: "_core",
-              type: "address",
+              internalType: "uint96",
+              name: "_courtID",
+              type: "uint96",
+            },
+            {
+              internalType: "uint256",
+              name: "_newStake",
+              type: "uint256",
             },
           ],
+          name: "setStakeBySortitionModule",
+          outputs: [],
           stateMutability: "nonpayable",
-          type: "constructor",
+          type: "function",
+        },
+        {
+          inputs: [],
+          name: "sortitionModule",
+          outputs: [
+            {
+              internalType: "contract ISortitionModule",
+              name: "",
+              type: "address",
+            },
+          ],
+          stateMutability: "view",
+          type: "function",
         },
         {
           inputs: [
@@ -21201,27 +21213,20 @@ export default {
               name: "_account",
               type: "address",
             },
-          ],
-          name: "balanceOf",
-          outputs: [
             {
               internalType: "uint256",
-              name: "totalStaked",
+              name: "_amount",
               type: "uint256",
             },
           ],
-          stateMutability: "view",
+          name: "transferBySortitionModule",
+          outputs: [],
+          stateMutability: "nonpayable",
           type: "function",
         },
         {
-          inputs: [
-            {
-              internalType: "contract IKlerosCore",
-              name: "_core",
-              type: "address",
-            },
-          ],
-          name: "changeCore",
+          inputs: [],
+          name: "unpause",
           outputs: [],
           stateMutability: "nonpayable",
           type: "function",
@@ -21230,23 +21235,28 @@ export default {
           inputs: [
             {
               internalType: "address",
-              name: "_governor",
+              name: "newImplementation",
               type: "address",
             },
+            {
+              internalType: "bytes",
+              name: "data",
+              type: "bytes",
+            },
           ],
-          name: "changeGovernor",
+          name: "upgradeToAndCall",
           outputs: [],
-          stateMutability: "nonpayable",
+          stateMutability: "payable",
           type: "function",
         },
         {
           inputs: [],
-          name: "core",
+          name: "version",
           outputs: [
             {
-              internalType: "contract IKlerosCore",
+              internalType: "string",
               name: "",
-              type: "address",
+              type: "string",
             },
           ],
           stateMutability: "view",
@@ -21254,55 +21264,45 @@ export default {
         },
         {
           inputs: [],
-          name: "decimals",
+          name: "wNative",
           outputs: [
             {
-              internalType: "uint8",
+              internalType: "address",
               name: "",
-              type: "uint8",
+              type: "address",
             },
           ],
           stateMutability: "view",
           type: "function",
         },
+      ],
+    },
+    KlerosCore_Proxy: {
+      address: "0x991d2df165670b9cac3B022f4B68D65b664222ea",
+      abi: [
         {
-          inputs: [],
-          name: "governor",
-          outputs: [
+          inputs: [
             {
               internalType: "address",
-              name: "",
+              name: "_implementation",
               type: "address",
             },
-          ],
-          stateMutability: "view",
-          type: "function",
-        },
-        {
-          inputs: [],
-          name: "name",
-          outputs: [
             {
-              internalType: "string",
-              name: "",
-              type: "string",
+              internalType: "bytes",
+              name: "_data",
+              type: "bytes",
             },
           ],
-          stateMutability: "view",
-          type: "function",
+          stateMutability: "nonpayable",
+          type: "constructor",
         },
         {
-          inputs: [],
-          name: "symbol",
-          outputs: [
-            {
-              internalType: "string",
-              name: "",
-              type: "string",
-            },
-          ],
-          stateMutability: "view",
-          type: "function",
+          stateMutability: "payable",
+          type: "fallback",
+        },
+        {
+          stateMutability: "payable",
+          type: "receive",
         },
       ],
     },
@@ -23898,7 +23898,7 @@ export default {
         },
       ],
     },
-    SortitionModuleNeo: {
+    SortitionModule: {
       address: "0x21A9402aDb818744B296e1d1BE58C804118DC03D",
       abi: [
         {
@@ -25022,7 +25022,7 @@ export default {
         },
       ],
     },
-    SortitionModuleNeo_Implementation: {
+    SortitionModule_Implementation: {
       address: "0x3f6D0daeD166b64FCfBb9bc7c9E26423c6C08eEE",
       abi: [
         {
@@ -26127,7 +26127,7 @@ export default {
         },
       ],
     },
-    SortitionModuleNeo_Proxy: {
+    SortitionModule_Proxy: {
       address: "0x21A9402aDb818744B296e1d1BE58C804118DC03D",
       abi: [
         {
diff --git a/contracts/deployments/arbitrum/DisputeKitClassicNeo.json b/contracts/deployments/arbitrum/DisputeKitClassic.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitClassicNeo.json
rename to contracts/deployments/arbitrum/DisputeKitClassic.json
diff --git a/contracts/deployments/arbitrum/DisputeKitClassicNeo_Implementation.json b/contracts/deployments/arbitrum/DisputeKitClassic_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitClassicNeo_Implementation.json
rename to contracts/deployments/arbitrum/DisputeKitClassic_Implementation.json
diff --git a/contracts/deployments/arbitrum/DisputeKitClassicNeo_Proxy.json b/contracts/deployments/arbitrum/DisputeKitClassic_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitClassicNeo_Proxy.json
rename to contracts/deployments/arbitrum/DisputeKitClassic_Proxy.json
diff --git a/contracts/deployments/arbitrum/DisputeKitGatedNeo.json b/contracts/deployments/arbitrum/DisputeKitGated.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitGatedNeo.json
rename to contracts/deployments/arbitrum/DisputeKitGated.json
diff --git a/contracts/deployments/arbitrum/DisputeKitGatedShutterNeo.json b/contracts/deployments/arbitrum/DisputeKitGatedShutter.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitGatedShutterNeo.json
rename to contracts/deployments/arbitrum/DisputeKitGatedShutter.json
diff --git a/contracts/deployments/arbitrum/DisputeKitGatedShutterNeo_Implementation.json b/contracts/deployments/arbitrum/DisputeKitGatedShutter_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitGatedShutterNeo_Implementation.json
rename to contracts/deployments/arbitrum/DisputeKitGatedShutter_Implementation.json
diff --git a/contracts/deployments/arbitrum/DisputeKitGatedShutterNeo_Proxy.json b/contracts/deployments/arbitrum/DisputeKitGatedShutter_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitGatedShutterNeo_Proxy.json
rename to contracts/deployments/arbitrum/DisputeKitGatedShutter_Proxy.json
diff --git a/contracts/deployments/arbitrum/DisputeKitGatedNeo_Implementation.json b/contracts/deployments/arbitrum/DisputeKitGated_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitGatedNeo_Implementation.json
rename to contracts/deployments/arbitrum/DisputeKitGated_Implementation.json
diff --git a/contracts/deployments/arbitrum/DisputeKitGatedNeo_Proxy.json b/contracts/deployments/arbitrum/DisputeKitGated_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitGatedNeo_Proxy.json
rename to contracts/deployments/arbitrum/DisputeKitGated_Proxy.json
diff --git a/contracts/deployments/arbitrum/DisputeKitShutterNeo.json b/contracts/deployments/arbitrum/DisputeKitShutter.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitShutterNeo.json
rename to contracts/deployments/arbitrum/DisputeKitShutter.json
diff --git a/contracts/deployments/arbitrum/DisputeKitShutterNeo_Implementation.json b/contracts/deployments/arbitrum/DisputeKitShutter_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitShutterNeo_Implementation.json
rename to contracts/deployments/arbitrum/DisputeKitShutter_Implementation.json
diff --git a/contracts/deployments/arbitrum/DisputeKitShutterNeo_Proxy.json b/contracts/deployments/arbitrum/DisputeKitShutter_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeKitShutterNeo_Proxy.json
rename to contracts/deployments/arbitrum/DisputeKitShutter_Proxy.json
diff --git a/contracts/deployments/arbitrum/DisputeResolverNeo.json b/contracts/deployments/arbitrum/DisputeResolver.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeResolverNeo.json
rename to contracts/deployments/arbitrum/DisputeResolver.json
diff --git a/contracts/deployments/arbitrum/DisputeResolverRulerNeo.json b/contracts/deployments/arbitrum/DisputeResolverRuler.json
similarity index 100%
rename from contracts/deployments/arbitrum/DisputeResolverRulerNeo.json
rename to contracts/deployments/arbitrum/DisputeResolverRuler.json
diff --git a/contracts/deployments/arbitrum/KlerosCoreNeo.json b/contracts/deployments/arbitrum/KlerosCore.json
similarity index 100%
rename from contracts/deployments/arbitrum/KlerosCoreNeo.json
rename to contracts/deployments/arbitrum/KlerosCore.json
diff --git a/contracts/deployments/arbitrum/KlerosCoreRulerNeo.json b/contracts/deployments/arbitrum/KlerosCoreRuler.json
similarity index 100%
rename from contracts/deployments/arbitrum/KlerosCoreRulerNeo.json
rename to contracts/deployments/arbitrum/KlerosCoreRuler.json
diff --git a/contracts/deployments/arbitrum/KlerosCoreRulerNeo_Implementation.json b/contracts/deployments/arbitrum/KlerosCoreRuler_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/KlerosCoreRulerNeo_Implementation.json
rename to contracts/deployments/arbitrum/KlerosCoreRuler_Implementation.json
diff --git a/contracts/deployments/arbitrum/KlerosCoreRulerNeo_Proxy.json b/contracts/deployments/arbitrum/KlerosCoreRuler_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/KlerosCoreRulerNeo_Proxy.json
rename to contracts/deployments/arbitrum/KlerosCoreRuler_Proxy.json
diff --git a/contracts/deployments/arbitrum/KlerosCoreNeo_Implementation.json b/contracts/deployments/arbitrum/KlerosCore_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/KlerosCoreNeo_Implementation.json
rename to contracts/deployments/arbitrum/KlerosCore_Implementation.json
diff --git a/contracts/deployments/arbitrum/KlerosCoreNeo_Proxy.json b/contracts/deployments/arbitrum/KlerosCore_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/KlerosCoreNeo_Proxy.json
rename to contracts/deployments/arbitrum/KlerosCore_Proxy.json
diff --git a/contracts/deployments/arbitrum/SortitionModuleNeo.json b/contracts/deployments/arbitrum/SortitionModule.json
similarity index 100%
rename from contracts/deployments/arbitrum/SortitionModuleNeo.json
rename to contracts/deployments/arbitrum/SortitionModule.json
diff --git a/contracts/deployments/arbitrum/SortitionModuleNeo_Implementation.json b/contracts/deployments/arbitrum/SortitionModule_Implementation.json
similarity index 100%
rename from contracts/deployments/arbitrum/SortitionModuleNeo_Implementation.json
rename to contracts/deployments/arbitrum/SortitionModule_Implementation.json
diff --git a/contracts/deployments/arbitrum/SortitionModuleNeo_Proxy.json b/contracts/deployments/arbitrum/SortitionModule_Proxy.json
similarity index 100%
rename from contracts/deployments/arbitrum/SortitionModuleNeo_Proxy.json
rename to contracts/deployments/arbitrum/SortitionModule_Proxy.json
diff --git a/contracts/deployments/contractsEthers.ts b/contracts/deployments/contractsEthers.ts
index 49bc0552e..b5da4705e 100644
--- a/contracts/deployments/contractsEthers.ts
+++ b/contracts/deployments/contractsEthers.ts
@@ -38,13 +38,13 @@ import {
   klerosCoreSnapshotProxyConfig as testnetSnapshotProxyConfig,
 } from "./testnet.viem";
 import {
-  klerosCoreNeoConfig as mainnetCoreConfig,
-  sortitionModuleNeoConfig as mainnetSortitionConfig,
-  disputeKitClassicNeoConfig as mainnetDkcConfig,
-  disputeKitShutterNeoConfig as mainnetDkShutterConfig,
-  disputeKitGatedNeoConfig as mainnetDkGatedConfig,
-  disputeKitGatedShutterNeoConfig as mainnetDkGatedShutterConfig,
-  disputeResolverNeoConfig as mainnetDrConfig,
+  klerosCoreConfig as mainnetCoreConfig,
+  sortitionModuleConfig as mainnetSortitionConfig,
+  disputeKitClassicConfig as mainnetDkcConfig,
+  disputeKitShutterConfig as mainnetDkShutterConfig,
+  disputeKitGatedConfig as mainnetDkGatedConfig,
+  disputeKitGatedShutterConfig as mainnetDkGatedShutterConfig,
+  disputeResolverConfig as mainnetDrConfig,
   disputeTemplateRegistryConfig as mainnetDtrConfig,
   evidenceModuleConfig as mainnetEvidenceConfig,
   policyRegistryConfig as mainnetPolicyRegistryConfig,
@@ -92,10 +92,6 @@ import {
   KlerosCoreUniversity__factory,
   SortitionModuleUniversity,
   SortitionModuleUniversity__factory,
-  KlerosCoreNeo,
-  KlerosCoreNeo__factory,
-  SortitionModuleNeo,
-  SortitionModuleNeo__factory,
 } from "../typechain-types";
 import { type ContractConfig, type DeploymentName, deployments, getAddress } from "./utils";
 
@@ -171,8 +167,8 @@ function getCommonFactories(
 
 export const getContracts = async (provider: ethers.Provider, deployment: DeploymentName) => {
   const { chainId } = deployments[deployment];
-  let klerosCore: KlerosCore | KlerosCoreNeo | KlerosCoreUniversity;
-  let sortition: SortitionModule | SortitionModuleNeo | SortitionModuleUniversity;
+  let klerosCore: KlerosCore | KlerosCoreUniversity;
+  let sortition: SortitionModule | SortitionModuleUniversity;
   let commonFactories: CommonFactories;
 
   switch (deployment) {
@@ -247,9 +243,9 @@ export const getContracts = async (provider: ethers.Provider, deployment: Deploy
         chainId
       );
       break;
-    case "mainnetNeo":
-      klerosCore = KlerosCoreNeo__factory.connect(getAddress(mainnetCoreConfig, chainId), provider);
-      sortition = SortitionModuleNeo__factory.connect(getAddress(mainnetSortitionConfig, chainId), provider);
+    case "mainnet":
+      klerosCore = KlerosCore__factory.connect(getAddress(mainnetCoreConfig, chainId), provider);
+      sortition = SortitionModule__factory.connect(getAddress(mainnetSortitionConfig, chainId), provider);
       commonFactories = getCommonFactories(
         {
           dkClassicConfig: mainnetDkcConfig,
diff --git a/contracts/deployments/contractsViem.ts b/contracts/deployments/contractsViem.ts
index 792ce5b3e..7a7338d71 100644
--- a/contracts/deployments/contractsViem.ts
+++ b/contracts/deployments/contractsViem.ts
@@ -39,13 +39,13 @@ import {
   klerosCoreSnapshotProxyConfig as testnetSnapshotProxyConfig,
 } from "./testnet.viem";
 import {
-  klerosCoreNeoConfig as mainnetCoreConfig,
-  sortitionModuleNeoConfig as mainnetSortitionConfig,
-  disputeKitClassicNeoConfig as mainnetDkClassicConfig,
-  disputeKitShutterNeoConfig as mainnetDkShutterConfig,
-  disputeKitGatedNeoConfig as mainnetDkGatedConfig,
-  disputeKitGatedShutterNeoConfig as mainnetDkGatedShutterConfig,
-  disputeResolverNeoConfig as mainnetDrConfig,
+  klerosCoreConfig as mainnetCoreConfig,
+  sortitionModuleConfig as mainnetSortitionConfig,
+  disputeKitClassicConfig as mainnetDkClassicConfig,
+  disputeKitShutterConfig as mainnetDkShutterConfig,
+  disputeKitGatedConfig as mainnetDkGatedConfig,
+  disputeKitGatedShutterConfig as mainnetDkGatedShutterConfig,
+  disputeResolverConfig as mainnetDrConfig,
   disputeTemplateRegistryConfig as mainnetDtrConfig,
   evidenceModuleConfig as mainnetEvidenceConfig,
   policyRegistryConfig as mainnetPolicyRegistryConfig,
@@ -203,7 +203,7 @@ export const getConfigs = ({ deployment }: { deployment: DeploymentName }): Cont
         },
       });
 
-    case "mainnetNeo":
+    case "mainnet":
       return getCommonConfigs({
         chainId,
         configs: {
diff --git a/contracts/deployments/mainnet.viem.ts b/contracts/deployments/mainnet.viem.ts
index c57906c57..eeada4b95 100644
--- a/contracts/deployments/mainnet.viem.ts
+++ b/contracts/deployments/mainnet.viem.ts
@@ -1725,13 +1725,13 @@ export const daiAddress = {
 export const daiConfig = { address: daiAddress, abi: daiAbi } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitClassicNeo
+// DisputeKitClassic
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421)
  */
-export const disputeKitClassicNeoAbi = [
+export const disputeKitClassicAbi = [
   { type: "fallback", stateMutability: "payable" },
   { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
@@ -2348,26 +2348,26 @@ export const disputeKitClassicNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421)
  */
-export const disputeKitClassicNeoAddress = {
+export const disputeKitClassicAddress = {
   42161: "0x70B464be85A547144C72485eBa2577E5D3A45421",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421)
  */
-export const disputeKitClassicNeoConfig = {
-  address: disputeKitClassicNeoAddress,
-  abi: disputeKitClassicNeoAbi,
+export const disputeKitClassicConfig = {
+  address: disputeKitClassicAddress,
+  abi: disputeKitClassicAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitClassicNeo_Implementation
+// DisputeKitClassic_Implementation
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x371Aa4B1AE5b5f9422f3Ff1d105029AAd1D319BC)
  */
-export const disputeKitClassicNeoImplementationAbi = [
+export const disputeKitClassicImplementationAbi = [
   { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
@@ -2975,26 +2975,26 @@ export const disputeKitClassicNeoImplementationAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x371Aa4B1AE5b5f9422f3Ff1d105029AAd1D319BC)
  */
-export const disputeKitClassicNeoImplementationAddress = {
+export const disputeKitClassicImplementationAddress = {
   42161: "0x371Aa4B1AE5b5f9422f3Ff1d105029AAd1D319BC",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x371Aa4B1AE5b5f9422f3Ff1d105029AAd1D319BC)
  */
-export const disputeKitClassicNeoImplementationConfig = {
-  address: disputeKitClassicNeoImplementationAddress,
-  abi: disputeKitClassicNeoImplementationAbi,
+export const disputeKitClassicImplementationConfig = {
+  address: disputeKitClassicImplementationAddress,
+  abi: disputeKitClassicImplementationAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitClassicNeo_Proxy
+// DisputeKitClassic_Proxy
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421)
  */
-export const disputeKitClassicNeoProxyAbi = [
+export const disputeKitClassicProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -3010,26 +3010,26 @@ export const disputeKitClassicNeoProxyAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421)
  */
-export const disputeKitClassicNeoProxyAddress = {
+export const disputeKitClassicProxyAddress = {
   42161: "0x70B464be85A547144C72485eBa2577E5D3A45421",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x70B464be85A547144C72485eBa2577E5D3A45421)
  */
-export const disputeKitClassicNeoProxyConfig = {
-  address: disputeKitClassicNeoProxyAddress,
-  abi: disputeKitClassicNeoProxyAbi,
+export const disputeKitClassicProxyConfig = {
+  address: disputeKitClassicProxyAddress,
+  abi: disputeKitClassicProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitGatedNeo
+// DisputeKitGated
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
  */
-export const disputeKitGatedNeoAbi = [
+export const disputeKitGatedAbi = [
   { type: "fallback", stateMutability: "payable" },
   { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
@@ -3657,27 +3657,28 @@ export const disputeKitGatedNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
  */
-export const disputeKitGatedNeoAddress = {
+export const disputeKitGatedAddress = {
   42161: "0xaE1eed20C125B739b64c948820C61F809ad9a925",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
  */
-export const disputeKitGatedNeoConfig = {
-  address: disputeKitGatedNeoAddress,
-  abi: disputeKitGatedNeoAbi,
+export const disputeKitGatedConfig = {
+  address: disputeKitGatedAddress,
+  abi: disputeKitGatedAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitGatedNeo_Implementation
+// DisputeKitGatedShutter
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
  */
-export const disputeKitGatedNeoImplementationAbi = [
-  { type: "constructor", inputs: [], stateMutability: "nonpayable" },
+export const disputeKitGatedShutterAbi = [
+  { type: "fallback", stateMutability: "payable" },
+  { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
   {
@@ -3748,6 +3749,43 @@ export const disputeKitGatedNeoImplementationAbi = [
     ],
     name: "CommitCast",
   },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_coreDisputeID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_juror",
+        internalType: "address",
+        type: "address",
+        indexed: true,
+      },
+      {
+        name: "_commit",
+        internalType: "bytes32",
+        type: "bytes32",
+        indexed: true,
+      },
+      {
+        name: "_identity",
+        internalType: "bytes32",
+        type: "bytes32",
+        indexed: false,
+      },
+      {
+        name: "_encryptedVote",
+        internalType: "bytes",
+        type: "bytes",
+        indexed: false,
+      },
+    ],
+    name: "CommitCastShutter",
+  },
   {
     type: "event",
     anonymous: false,
@@ -3974,6 +4012,19 @@ export const disputeKitGatedNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    inputs: [
+      { name: "_coreDisputeID", internalType: "uint256", type: "uint256" },
+      { name: "_voteIDs", internalType: "uint256[]", type: "uint256[]" },
+      { name: "_commit", internalType: "bytes32", type: "bytes32" },
+      { name: "_identity", internalType: "bytes32", type: "bytes32" },
+      { name: "_encryptedVote", internalType: "bytes", type: "bytes" },
+    ],
+    name: "castCommitShutter",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
   {
     type: "function",
     inputs: [
@@ -3987,6 +4038,19 @@ export const disputeKitGatedNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    inputs: [
+      { name: "_coreDisputeID", internalType: "uint256", type: "uint256" },
+      { name: "_voteIDs", internalType: "uint256[]", type: "uint256[]" },
+      { name: "_choice", internalType: "uint256", type: "uint256" },
+      { name: "_salt", internalType: "uint256", type: "uint256" },
+      { name: "_justification", internalType: "string", type: "string" },
+    ],
+    name: "castVoteShutter",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
   {
     type: "function",
     inputs: [{ name: "_core", internalType: "address", type: "address" }],
@@ -4077,17 +4141,6 @@ export const disputeKitGatedNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
-  {
-    type: "function",
-    inputs: [{ name: "_extraData", internalType: "bytes", type: "bytes" }],
-    name: "extraDataToTokenInfo",
-    outputs: [
-      { name: "tokenGate", internalType: "address", type: "address" },
-      { name: "isERC1155", internalType: "bool", type: "bool" },
-      { name: "tokenId", internalType: "uint256", type: "uint256" },
-    ],
-    stateMutability: "pure",
-  },
   {
     type: "function",
     inputs: [
@@ -4290,31 +4343,6 @@ export const disputeKitGatedNeoImplementationAbi = [
     outputs: [{ name: "amount", internalType: "uint256", type: "uint256" }],
     stateMutability: "nonpayable",
   },
-] as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a)
- */
-export const disputeKitGatedNeoImplementationAddress = {
-  42161: "0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a",
-} as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a)
- */
-export const disputeKitGatedNeoImplementationConfig = {
-  address: disputeKitGatedNeoImplementationAddress,
-  abi: disputeKitGatedNeoImplementationAbi,
-} as const;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitGatedNeo_Proxy
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
- */
-export const disputeKitGatedNeoProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -4323,35 +4351,32 @@ export const disputeKitGatedNeoProxyAbi = [
     ],
     stateMutability: "nonpayable",
   },
-  { type: "fallback", stateMutability: "payable" },
-  { type: "receive", stateMutability: "payable" },
 ] as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
  */
-export const disputeKitGatedNeoProxyAddress = {
-  42161: "0xaE1eed20C125B739b64c948820C61F809ad9a925",
+export const disputeKitGatedShutterAddress = {
+  42161: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
 } as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
  */
-export const disputeKitGatedNeoProxyConfig = {
-  address: disputeKitGatedNeoProxyAddress,
-  abi: disputeKitGatedNeoProxyAbi,
+export const disputeKitGatedShutterConfig = {
+  address: disputeKitGatedShutterAddress,
+  abi: disputeKitGatedShutterAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitGatedShutterNeo
+// DisputeKitGatedShutter_Implementation
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32)
  */
-export const disputeKitGatedShutterNeoAbi = [
-  { type: "fallback", stateMutability: "payable" },
-  { type: "receive", stateMutability: "payable" },
+export const disputeKitGatedShutterImplementationAbi = [
+  { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
   {
@@ -5016,6 +5041,31 @@ export const disputeKitGatedShutterNeoAbi = [
     outputs: [{ name: "amount", internalType: "uint256", type: "uint256" }],
     stateMutability: "nonpayable",
   },
+] as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32)
+ */
+export const disputeKitGatedShutterImplementationAddress = {
+  42161: "0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32",
+} as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32)
+ */
+export const disputeKitGatedShutterImplementationConfig = {
+  address: disputeKitGatedShutterImplementationAddress,
+  abi: disputeKitGatedShutterImplementationAbi,
+} as const;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// DisputeKitGatedShutter_Proxy
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
+ */
+export const disputeKitGatedShutterProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -5024,31 +5074,33 @@ export const disputeKitGatedShutterNeoAbi = [
     ],
     stateMutability: "nonpayable",
   },
+  { type: "fallback", stateMutability: "payable" },
+  { type: "receive", stateMutability: "payable" },
 ] as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
  */
-export const disputeKitGatedShutterNeoAddress = {
+export const disputeKitGatedShutterProxyAddress = {
   42161: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
  */
-export const disputeKitGatedShutterNeoConfig = {
-  address: disputeKitGatedShutterNeoAddress,
-  abi: disputeKitGatedShutterNeoAbi,
+export const disputeKitGatedShutterProxyConfig = {
+  address: disputeKitGatedShutterProxyAddress,
+  abi: disputeKitGatedShutterProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitGatedShutterNeo_Implementation
+// DisputeKitGated_Implementation
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a)
  */
-export const disputeKitGatedShutterNeoImplementationAbi = [
+export const disputeKitGatedImplementationAbi = [
   { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
@@ -5120,43 +5172,6 @@ export const disputeKitGatedShutterNeoImplementationAbi = [
     ],
     name: "CommitCast",
   },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_coreDisputeID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_juror",
-        internalType: "address",
-        type: "address",
-        indexed: true,
-      },
-      {
-        name: "_commit",
-        internalType: "bytes32",
-        type: "bytes32",
-        indexed: true,
-      },
-      {
-        name: "_identity",
-        internalType: "bytes32",
-        type: "bytes32",
-        indexed: false,
-      },
-      {
-        name: "_encryptedVote",
-        internalType: "bytes",
-        type: "bytes",
-        indexed: false,
-      },
-    ],
-    name: "CommitCastShutter",
-  },
   {
     type: "event",
     anonymous: false,
@@ -5383,19 +5398,6 @@ export const disputeKitGatedShutterNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
-  {
-    type: "function",
-    inputs: [
-      { name: "_coreDisputeID", internalType: "uint256", type: "uint256" },
-      { name: "_voteIDs", internalType: "uint256[]", type: "uint256[]" },
-      { name: "_commit", internalType: "bytes32", type: "bytes32" },
-      { name: "_identity", internalType: "bytes32", type: "bytes32" },
-      { name: "_encryptedVote", internalType: "bytes", type: "bytes" },
-    ],
-    name: "castCommitShutter",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
   {
     type: "function",
     inputs: [
@@ -5409,19 +5411,6 @@ export const disputeKitGatedShutterNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
-  {
-    type: "function",
-    inputs: [
-      { name: "_coreDisputeID", internalType: "uint256", type: "uint256" },
-      { name: "_voteIDs", internalType: "uint256[]", type: "uint256[]" },
-      { name: "_choice", internalType: "uint256", type: "uint256" },
-      { name: "_salt", internalType: "uint256", type: "uint256" },
-      { name: "_justification", internalType: "string", type: "string" },
-    ],
-    name: "castVoteShutter",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
   {
     type: "function",
     inputs: [{ name: "_core", internalType: "address", type: "address" }],
@@ -5512,6 +5501,17 @@ export const disputeKitGatedShutterNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    inputs: [{ name: "_extraData", internalType: "bytes", type: "bytes" }],
+    name: "extraDataToTokenInfo",
+    outputs: [
+      { name: "tokenGate", internalType: "address", type: "address" },
+      { name: "isERC1155", internalType: "bool", type: "bool" },
+      { name: "tokenId", internalType: "uint256", type: "uint256" },
+    ],
+    stateMutability: "pure",
+  },
   {
     type: "function",
     inputs: [
@@ -5717,28 +5717,28 @@ export const disputeKitGatedShutterNeoImplementationAbi = [
 ] as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a)
  */
-export const disputeKitGatedShutterNeoImplementationAddress = {
-  42161: "0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32",
+export const disputeKitGatedImplementationAddress = {
+  42161: "0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a",
 } as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb12EB4c0716d3A9861a9AC471c6CdDB808d61b32)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEA7863E6dE863e8E6d037D8693ad5dA45Db7790a)
  */
-export const disputeKitGatedShutterNeoImplementationConfig = {
-  address: disputeKitGatedShutterNeoImplementationAddress,
-  abi: disputeKitGatedShutterNeoImplementationAbi,
+export const disputeKitGatedImplementationConfig = {
+  address: disputeKitGatedImplementationAddress,
+  abi: disputeKitGatedImplementationAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitGatedShutterNeo_Proxy
+// DisputeKitGated_Proxy
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
  */
-export const disputeKitGatedShutterNeoProxyAbi = [
+export const disputeKitGatedProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -5752,28 +5752,28 @@ export const disputeKitGatedShutterNeoProxyAbi = [
 ] as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
  */
-export const disputeKitGatedShutterNeoProxyAddress = {
-  42161: "0x788330092B9704809C19858E39EB9Ac402c2E47b",
+export const disputeKitGatedProxyAddress = {
+  42161: "0xaE1eed20C125B739b64c948820C61F809ad9a925",
 } as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x788330092B9704809C19858E39EB9Ac402c2E47b)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xaE1eed20C125B739b64c948820C61F809ad9a925)
  */
-export const disputeKitGatedShutterNeoProxyConfig = {
-  address: disputeKitGatedShutterNeoProxyAddress,
-  abi: disputeKitGatedShutterNeoProxyAbi,
+export const disputeKitGatedProxyConfig = {
+  address: disputeKitGatedProxyAddress,
+  abi: disputeKitGatedProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitShutterNeo
+// DisputeKitShutter
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x9D3e3f1765744c2a1BC6F6088549770444BBC768)
  */
-export const disputeKitShutterNeoAbi = [
+export const disputeKitShutterAbi = [
   { type: "fallback", stateMutability: "payable" },
   { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
@@ -6453,26 +6453,26 @@ export const disputeKitShutterNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x9D3e3f1765744c2a1BC6F6088549770444BBC768)
  */
-export const disputeKitShutterNeoAddress = {
+export const disputeKitShutterAddress = {
   42161: "0x9D3e3f1765744c2a1BC6F6088549770444BBC768",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x9D3e3f1765744c2a1BC6F6088549770444BBC768)
  */
-export const disputeKitShutterNeoConfig = {
-  address: disputeKitShutterNeoAddress,
-  abi: disputeKitShutterNeoAbi,
+export const disputeKitShutterConfig = {
+  address: disputeKitShutterAddress,
+  abi: disputeKitShutterAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitShutterNeo_Implementation
+// DisputeKitShutter_Implementation
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xF3103B46403A0bBd4551648BFb29BCC2b8783947)
  */
-export const disputeKitShutterNeoImplementationAbi = [
+export const disputeKitShutterImplementationAbi = [
   { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
@@ -7143,26 +7143,26 @@ export const disputeKitShutterNeoImplementationAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xF3103B46403A0bBd4551648BFb29BCC2b8783947)
  */
-export const disputeKitShutterNeoImplementationAddress = {
+export const disputeKitShutterImplementationAddress = {
   42161: "0xF3103B46403A0bBd4551648BFb29BCC2b8783947",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xF3103B46403A0bBd4551648BFb29BCC2b8783947)
  */
-export const disputeKitShutterNeoImplementationConfig = {
-  address: disputeKitShutterNeoImplementationAddress,
-  abi: disputeKitShutterNeoImplementationAbi,
+export const disputeKitShutterImplementationConfig = {
+  address: disputeKitShutterImplementationAddress,
+  abi: disputeKitShutterImplementationAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeKitShutterNeo_Proxy
+// DisputeKitShutter_Proxy
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x9D3e3f1765744c2a1BC6F6088549770444BBC768)
  */
-export const disputeKitShutterNeoProxyAbi = [
+export const disputeKitShutterProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -7178,26 +7178,26 @@ export const disputeKitShutterNeoProxyAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x9D3e3f1765744c2a1BC6F6088549770444BBC768)
  */
-export const disputeKitShutterNeoProxyAddress = {
+export const disputeKitShutterProxyAddress = {
   42161: "0x9D3e3f1765744c2a1BC6F6088549770444BBC768",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x9D3e3f1765744c2a1BC6F6088549770444BBC768)
  */
-export const disputeKitShutterNeoProxyConfig = {
-  address: disputeKitShutterNeoProxyAddress,
-  abi: disputeKitShutterNeoProxyAbi,
+export const disputeKitShutterProxyConfig = {
+  address: disputeKitShutterProxyAddress,
+  abi: disputeKitShutterProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeResolverNeo
+// DisputeResolver
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb5526D022962A1fFf6eD32C93e8b714c901F4323)
  */
-export const disputeResolverNeoAbi = [
+export const disputeResolverAbi = [
   {
     type: "constructor",
     inputs: [
@@ -7413,26 +7413,26 @@ export const disputeResolverNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb5526D022962A1fFf6eD32C93e8b714c901F4323)
  */
-export const disputeResolverNeoAddress = {
+export const disputeResolverAddress = {
   42161: "0xb5526D022962A1fFf6eD32C93e8b714c901F4323",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb5526D022962A1fFf6eD32C93e8b714c901F4323)
  */
-export const disputeResolverNeoConfig = {
-  address: disputeResolverNeoAddress,
-  abi: disputeResolverNeoAbi,
+export const disputeResolverConfig = {
+  address: disputeResolverAddress,
+  abi: disputeResolverAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// DisputeResolverRulerNeo
+// DisputeResolverRuler
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140)
  */
-export const disputeResolverRulerNeoAbi = [
+export const disputeResolverRulerAbi = [
   {
     type: "constructor",
     inputs: [
@@ -7648,16 +7648,16 @@ export const disputeResolverRulerNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140)
  */
-export const disputeResolverRulerNeoAddress = {
+export const disputeResolverRulerAddress = {
   42161: "0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xb3a5FdEAF461c42caCe148e978e6FBCa97bE6140)
  */
-export const disputeResolverRulerNeoConfig = {
-  address: disputeResolverRulerNeoAddress,
-  abi: disputeResolverRulerNeoAbi,
+export const disputeResolverRulerConfig = {
+  address: disputeResolverRulerAddress,
+  abi: disputeResolverRulerAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -8604,13 +8604,13 @@ export const iHomeGatewayAbi = [
 ] as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreNeo
+// KlerosCore
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
  */
-export const klerosCoreNeoAbi = [
+export const klerosCoreAbi = [
   { type: "fallback", stateMutability: "payable" },
   { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
@@ -9805,65 +9805,46 @@ export const klerosCoreNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
  */
-export const klerosCoreNeoAddress = {
+export const klerosCoreAddress = {
   42161: "0x991d2df165670b9cac3B022f4B68D65b664222ea",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
  */
-export const klerosCoreNeoConfig = {
-  address: klerosCoreNeoAddress,
-  abi: klerosCoreNeoAbi,
+export const klerosCoreConfig = {
+  address: klerosCoreAddress,
+  abi: klerosCoreAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreNeo_Implementation
+// KlerosCoreRuler
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xC1210493804eEF123096F9581Ee82B915150E54c)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
  */
-export const klerosCoreNeoImplementationAbi = [
-  { type: "constructor", inputs: [], stateMutability: "nonpayable" },
+export const klerosCoreRulerAbi = [
+  { type: "fallback", stateMutability: "payable" },
+  { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "AppealFeesNotEnough" },
-  { type: "error", inputs: [], name: "AppealPeriodNotPassed" },
-  { type: "error", inputs: [], name: "ArbitrableNotWhitelisted" },
   { type: "error", inputs: [], name: "ArbitrationFeesNotEnough" },
-  { type: "error", inputs: [], name: "CannotDisableClassicDK" },
-  { type: "error", inputs: [], name: "CommitPeriodNotPassed" },
-  { type: "error", inputs: [], name: "DisputeKitNotSupportedByCourt" },
-  { type: "error", inputs: [], name: "DisputeKitOnly" },
   { type: "error", inputs: [], name: "DisputeNotAppealable" },
-  { type: "error", inputs: [], name: "DisputePeriodIsFinal" },
-  { type: "error", inputs: [], name: "DisputeStillDrawing" },
-  { type: "error", inputs: [], name: "EvidenceNotPassedAndNotAppeal" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
   { type: "error", inputs: [], name: "GovernorOnly" },
-  { type: "error", inputs: [], name: "GuardianOrGovernorOnly" },
-  { type: "error", inputs: [], name: "InvalidDisputKitParent" },
+  { type: "error", inputs: [], name: "GovernorOrInstructorOnly" },
   { type: "error", inputs: [], name: "InvalidForkingCourtAsParent" },
   {
     type: "error",
     inputs: [{ name: "implementation", internalType: "address", type: "address" }],
     name: "InvalidImplementation",
   },
-  { type: "error", inputs: [], name: "MinStakeLowerThanParentCourt" },
-  { type: "error", inputs: [], name: "MustSupportDisputeKitClassic" },
-  { type: "error", inputs: [], name: "NotEligibleForStaking" },
-  { type: "error", inputs: [], name: "NotEvidencePeriod" },
-  { type: "error", inputs: [], name: "NotExecutionPeriod" },
+  { type: "error", inputs: [], name: "NoRulerSet" },
   { type: "error", inputs: [], name: "NotInitializing" },
+  { type: "error", inputs: [], name: "RulerOnly" },
   { type: "error", inputs: [], name: "RulingAlreadyExecuted" },
-  { type: "error", inputs: [], name: "SortitionModuleOnly" },
-  { type: "error", inputs: [], name: "StakingInTooManyCourts" },
-  { type: "error", inputs: [], name: "StakingLessThanCourtMinStake" },
-  { type: "error", inputs: [], name: "StakingMoreThanMaxStakePerJuror" },
-  { type: "error", inputs: [], name: "StakingMoreThanMaxTotalStaked" },
-  { type: "error", inputs: [], name: "StakingNotPossibleInThisCourt" },
-  { type: "error", inputs: [], name: "StakingTransferFailed" },
-  { type: "error", inputs: [], name: "StakingZeroWhenNoStake" },
+  { type: "error", inputs: [], name: "RulingModeNotSet" },
   { type: "error", inputs: [], name: "TokenNotAccepted" },
   { type: "error", inputs: [], name: "TransferFailed" },
   { type: "error", inputs: [], name: "UUPSUnauthorizedCallContext" },
@@ -9872,13 +9853,7 @@ export const klerosCoreNeoImplementationAbi = [
     inputs: [{ name: "slot", internalType: "bytes32", type: "bytes32" }],
     name: "UUPSUnsupportedProxiableUUID",
   },
-  { type: "error", inputs: [], name: "UnstakingTransferFailed" },
   { type: "error", inputs: [], name: "UnsuccessfulCall" },
-  { type: "error", inputs: [], name: "UnsupportedDisputeKit" },
-  { type: "error", inputs: [], name: "VotePeriodNotPassed" },
-  { type: "error", inputs: [], name: "WhenNotPausedOnly" },
-  { type: "error", inputs: [], name: "WhenPausedOnly" },
-  { type: "error", inputs: [], name: "WrongDisputeKitIndex" },
   {
     type: "event",
     anonymous: false,
@@ -9931,14 +9906,52 @@ export const klerosCoreNeoImplementationAbi = [
     ],
     name: "AppealPossible",
   },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+        indexed: true,
+      },
+      {
+        name: "mode",
+        internalType: "enum KlerosCoreRuler.RulingMode",
+        type: "uint8",
+        indexed: true,
+      },
+      {
+        name: "_disputeID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_ruling",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: false,
+      },
+      { name: "tied", internalType: "bool", type: "bool", indexed: false },
+      {
+        name: "overridden",
+        internalType: "bool",
+        type: "bool",
+        indexed: false,
+      },
+    ],
+    name: "AutoRuled",
+  },
   {
     type: "event",
     anonymous: false,
     inputs: [
       {
         name: "_courtID",
-        internalType: "uint96",
-        type: "uint96",
+        internalType: "uint256",
+        type: "uint256",
         indexed: true,
       },
       {
@@ -9983,12 +9996,6 @@ export const klerosCoreNeoImplementationAbi = [
         type: "uint256[4]",
         indexed: false,
       },
-      {
-        name: "_supportedDisputeKits",
-        internalType: "uint256[]",
-        type: "uint256[]",
-        indexed: false,
-      },
     ],
     name: "CourtCreated",
   },
@@ -10091,107 +10098,6 @@ export const klerosCoreNeoImplementationAbi = [
     ],
     name: "DisputeCreation",
   },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_disputeKitID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_disputeKitAddress",
-        internalType: "contract IDisputeKit",
-        type: "address",
-        indexed: true,
-      },
-    ],
-    name: "DisputeKitCreated",
-  },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_courtID",
-        internalType: "uint96",
-        type: "uint96",
-        indexed: true,
-      },
-      {
-        name: "_disputeKitID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      { name: "_enable", internalType: "bool", type: "bool", indexed: true },
-    ],
-    name: "DisputeKitEnabled",
-  },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_disputeID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_roundID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_fromDisputeKitID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_toDisputeKitID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: false,
-      },
-    ],
-    name: "DisputeKitJump",
-  },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_address",
-        internalType: "address",
-        type: "address",
-        indexed: true,
-      },
-      {
-        name: "_disputeID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_roundID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: false,
-      },
-      {
-        name: "_voteID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: false,
-      },
-    ],
-    name: "Draw",
-  },
   {
     type: "event",
     anonymous: false,
@@ -10279,14 +10185,67 @@ export const klerosCoreNeoImplementationAbi = [
       },
       {
         name: "_period",
-        internalType: "enum KlerosCoreBase.Period",
+        internalType: "enum KlerosCoreRuler.Period",
         type: "uint8",
         indexed: false,
       },
     ],
     name: "NewPeriod",
   },
-  { type: "event", anonymous: false, inputs: [], name: "Paused" },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+        indexed: true,
+      },
+      {
+        name: "_oldRuler",
+        internalType: "address",
+        type: "address",
+        indexed: true,
+      },
+      {
+        name: "_newRuler",
+        internalType: "address",
+        type: "address",
+        indexed: true,
+      },
+    ],
+    name: "RulerChanged",
+  },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+        indexed: true,
+      },
+      {
+        name: "_settings",
+        internalType: "struct KlerosCoreRuler.RulerSettings",
+        type: "tuple",
+        components: [
+          {
+            name: "rulingMode",
+            internalType: "enum KlerosCoreRuler.RulingMode",
+            type: "uint8",
+          },
+          { name: "presetRuling", internalType: "uint256", type: "uint256" },
+          { name: "presetTied", internalType: "bool", type: "bool" },
+          { name: "presetOverridden", internalType: "bool", type: "bool" },
+        ],
+        indexed: false,
+      },
+    ],
+    name: "RulerSettingsChanged",
+  },
   {
     type: "event",
     anonymous: false,
@@ -10361,7 +10320,6 @@ export const klerosCoreNeoImplementationAbi = [
     ],
     name: "TokenAndETHShift",
   },
-  { type: "event", anonymous: false, inputs: [], name: "Unpaused" },
   {
     type: "event",
     anonymous: false,
@@ -10375,25 +10333,13 @@ export const klerosCoreNeoImplementationAbi = [
     ],
     name: "Upgraded",
   },
-  {
-    type: "function",
-    inputs: [
-      {
-        name: "_disputeKitAddress",
-        internalType: "contract IDisputeKit",
-        type: "address",
-      },
-    ],
-    name: "addNewDisputeKit",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
   {
     type: "function",
     inputs: [
       { name: "_disputeID", internalType: "uint256", type: "uint256" },
       { name: "_numberOfChoices", internalType: "uint256", type: "uint256" },
-      { name: "_extraData", internalType: "bytes", type: "bytes" },
+      { name: "", internalType: "bytes", type: "bytes" },
+      { name: "_jump", internalType: "bool", type: "bool" },
     ],
     name: "appeal",
     outputs: [],
@@ -10401,28 +10347,14 @@ export const klerosCoreNeoImplementationAbi = [
   },
   {
     type: "function",
-    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
+    inputs: [
+      { name: "_disputeID", internalType: "uint256", type: "uint256" },
+      { name: "_jump", internalType: "bool", type: "bool" },
+    ],
     name: "appealCost",
     outputs: [{ name: "cost", internalType: "uint256", type: "uint256" }],
     stateMutability: "view",
   },
-  {
-    type: "function",
-    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
-    name: "appealPeriod",
-    outputs: [
-      { name: "start", internalType: "uint256", type: "uint256" },
-      { name: "end", internalType: "uint256", type: "uint256" },
-    ],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    inputs: [{ name: "", internalType: "address", type: "address" }],
-    name: "arbitrableWhitelist",
-    outputs: [{ name: "", internalType: "bool", type: "bool" }],
-    stateMutability: "view",
-  },
   {
     type: "function",
     inputs: [
@@ -10450,16 +10382,6 @@ export const klerosCoreNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
-  {
-    type: "function",
-    inputs: [
-      { name: "_arbitrable", internalType: "address", type: "address" },
-      { name: "_allowed", internalType: "bool", type: "bool" },
-    ],
-    name: "changeArbitrableWhitelist",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
   {
     type: "function",
     inputs: [
@@ -10499,15 +10421,22 @@ export const klerosCoreNeoImplementationAbi = [
   },
   {
     type: "function",
-    inputs: [{ name: "_guardian", internalType: "address", type: "address" }],
-    name: "changeGuardian",
+    inputs: [{ name: "_pinakion", internalType: "contract IERC20", type: "address" }],
+    name: "changePinakion",
     outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [{ name: "_jurorNft", internalType: "contract IERC721", type: "address" }],
-    name: "changeJurorNft",
+    inputs: [
+      {
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+      },
+      { name: "_newRuler", internalType: "address", type: "address" },
+    ],
+    name: "changeRuler",
     outputs: [],
     stateMutability: "nonpayable",
   },
@@ -10515,19 +10444,28 @@ export const klerosCoreNeoImplementationAbi = [
     type: "function",
     inputs: [
       {
-        name: "_jurorProsecutionModule",
-        internalType: "address",
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
         type: "address",
       },
+      { name: "_presetRuling", internalType: "uint256", type: "uint256" },
+      { name: "_presetTied", internalType: "bool", type: "bool" },
+      { name: "_presetOverridden", internalType: "bool", type: "bool" },
     ],
-    name: "changeJurorProsecutionModule",
+    name: "changeRulingModeToAutomaticPreset",
     outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [{ name: "_pinakion", internalType: "contract IERC20", type: "address" }],
-    name: "changePinakion",
+    inputs: [
+      {
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+      },
+    ],
+    name: "changeRulingModeToAutomaticRandom",
     outputs: [],
     stateMutability: "nonpayable",
   },
@@ -10535,12 +10473,12 @@ export const klerosCoreNeoImplementationAbi = [
     type: "function",
     inputs: [
       {
-        name: "_sortitionModule",
-        internalType: "contract ISortitionModule",
+        name: "_arbitrable",
+        internalType: "contract IArbitrableV2",
         type: "address",
       },
     ],
-    name: "changeSortitionModule",
+    name: "changeRulingModeToManual",
     outputs: [],
     stateMutability: "nonpayable",
   },
@@ -10583,12 +10521,6 @@ export const klerosCoreNeoImplementationAbi = [
         internalType: "uint256[4]",
         type: "uint256[4]",
       },
-      { name: "_sortitionExtraData", internalType: "bytes", type: "bytes" },
-      {
-        name: "_supportedDisputeKits",
-        internalType: "uint256[]",
-        type: "uint256[]",
-      },
     ],
     name: "createCourt",
     outputs: [],
@@ -10638,13 +10570,6 @@ export const klerosCoreNeoImplementationAbi = [
     ],
     stateMutability: "view",
   },
-  {
-    type: "function",
-    inputs: [{ name: "", internalType: "uint256", type: "uint256" }],
-    name: "disputeKits",
-    outputs: [{ name: "", internalType: "contract IDisputeKit", type: "address" }],
-    stateMutability: "view",
-  },
   {
     type: "function",
     inputs: [{ name: "", internalType: "uint256", type: "uint256" }],
@@ -10658,41 +10583,18 @@ export const klerosCoreNeoImplementationAbi = [
       },
       {
         name: "period",
-        internalType: "enum KlerosCoreBase.Period",
+        internalType: "enum KlerosCoreRuler.Period",
         type: "uint8",
       },
       { name: "ruled", internalType: "bool", type: "bool" },
-      { name: "lastPeriodChange", internalType: "uint256", type: "uint256" },
     ],
     stateMutability: "view",
   },
-  {
-    type: "function",
-    inputs: [
-      { name: "_disputeID", internalType: "uint256", type: "uint256" },
-      { name: "_iterations", internalType: "uint256", type: "uint256" },
-    ],
-    name: "draw",
-    outputs: [{ name: "nbDrawnJurors", internalType: "uint256", type: "uint256" }],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    inputs: [
-      { name: "_courtID", internalType: "uint96", type: "uint96" },
-      { name: "_disputeKitIDs", internalType: "uint256[]", type: "uint256[]" },
-      { name: "_enable", internalType: "bool", type: "bool" },
-    ],
-    name: "enableDisputeKits",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
   {
     type: "function",
     inputs: [
       { name: "_disputeID", internalType: "uint256", type: "uint256" },
       { name: "_round", internalType: "uint256", type: "uint256" },
-      { name: "_iterations", internalType: "uint256", type: "uint256" },
     ],
     name: "execute",
     outputs: [],
@@ -10711,7 +10613,12 @@ export const klerosCoreNeoImplementationAbi = [
   },
   {
     type: "function",
-    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
+    inputs: [
+      { name: "_disputeID", internalType: "uint256", type: "uint256" },
+      { name: "_ruling", internalType: "uint256", type: "uint256" },
+      { name: "tied", internalType: "bool", type: "bool" },
+      { name: "overridden", internalType: "bool", type: "bool" },
+    ],
     name: "executeRuling",
     outputs: [],
     stateMutability: "nonpayable",
@@ -10719,7 +10626,7 @@ export const klerosCoreNeoImplementationAbi = [
   {
     type: "function",
     inputs: [],
-    name: "getDisputeKitsLength",
+    name: "getNextDisputeID",
     outputs: [{ name: "", internalType: "uint256", type: "uint256" }],
     stateMutability: "view",
   },
@@ -10737,16 +10644,6 @@ export const klerosCoreNeoImplementationAbi = [
     outputs: [{ name: "", internalType: "uint256", type: "uint256" }],
     stateMutability: "view",
   },
-  {
-    type: "function",
-    inputs: [
-      { name: "_disputeID", internalType: "uint256", type: "uint256" },
-      { name: "_round", internalType: "uint256", type: "uint256" },
-    ],
-    name: "getPnkAtStakePerJuror",
-    outputs: [{ name: "", internalType: "uint256", type: "uint256" }],
-    stateMutability: "view",
-  },
   {
     type: "function",
     inputs: [
@@ -10757,40 +10654,24 @@ export const klerosCoreNeoImplementationAbi = [
     outputs: [
       {
         name: "",
-        internalType: "struct KlerosCoreBase.Round",
+        internalType: "struct KlerosCoreRuler.Round",
         type: "tuple",
         components: [
-          { name: "disputeKitID", internalType: "uint256", type: "uint256" },
-          {
-            name: "pnkAtStakePerJuror",
-            internalType: "uint256",
-            type: "uint256",
-          },
           {
             name: "totalFeesForJurors",
             internalType: "uint256",
             type: "uint256",
           },
-          { name: "nbVotes", internalType: "uint256", type: "uint256" },
-          { name: "repartitions", internalType: "uint256", type: "uint256" },
-          { name: "pnkPenalties", internalType: "uint256", type: "uint256" },
-          { name: "drawnJurors", internalType: "address[]", type: "address[]" },
           {
             name: "sumFeeRewardPaid",
             internalType: "uint256",
             type: "uint256",
           },
-          {
-            name: "sumPnkRewardPaid",
-            internalType: "uint256",
-            type: "uint256",
-          },
           {
             name: "feeToken",
             internalType: "contract IERC20",
             type: "address",
           },
-          { name: "drawIterations", internalType: "uint256", type: "uint256" },
         ],
       },
     ],
@@ -10816,257 +10697,125 @@ export const klerosCoreNeoImplementationAbi = [
     outputs: [{ name: "", internalType: "address", type: "address" }],
     stateMutability: "view",
   },
-  {
-    type: "function",
-    inputs: [],
-    name: "guardian",
-    outputs: [{ name: "", internalType: "address", type: "address" }],
-    stateMutability: "view",
-  },
   {
     type: "function",
     inputs: [
       { name: "_governor", internalType: "address", type: "address" },
-      { name: "_guardian", internalType: "address", type: "address" },
       { name: "_pinakion", internalType: "contract IERC20", type: "address" },
-      {
-        name: "_jurorProsecutionModule",
-        internalType: "address",
-        type: "address",
-      },
-      {
-        name: "_disputeKit",
-        internalType: "contract IDisputeKit",
-        type: "address",
-      },
-      { name: "_hiddenVotes", internalType: "bool", type: "bool" },
       {
         name: "_courtParameters",
         internalType: "uint256[4]",
         type: "uint256[4]",
       },
-      {
-        name: "_timesPerPeriod",
-        internalType: "uint256[4]",
-        type: "uint256[4]",
-      },
-      { name: "_sortitionExtraData", internalType: "bytes", type: "bytes" },
-      {
-        name: "_sortitionModuleAddress",
-        internalType: "contract ISortitionModule",
-        type: "address",
-      },
-      { name: "_jurorNft", internalType: "contract IERC721", type: "address" },
-      { name: "_wNative", internalType: "address", type: "address" },
     ],
     name: "initialize",
     outputs: [],
     stateMutability: "nonpayable",
   },
-  {
-    type: "function",
-    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
-    name: "isDisputeKitJumping",
-    outputs: [{ name: "", internalType: "bool", type: "bool" }],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    inputs: [
-      { name: "_courtID", internalType: "uint96", type: "uint96" },
-      { name: "_disputeKitID", internalType: "uint256", type: "uint256" },
-    ],
-    name: "isSupported",
-    outputs: [{ name: "", internalType: "bool", type: "bool" }],
-    stateMutability: "view",
-  },
   {
     type: "function",
     inputs: [],
-    name: "jurorNft",
-    outputs: [{ name: "", internalType: "contract IERC721", type: "address" }],
+    name: "pinakion",
+    outputs: [{ name: "", internalType: "contract IERC20", type: "address" }],
     stateMutability: "view",
   },
   {
     type: "function",
     inputs: [],
-    name: "jurorProsecutionModule",
-    outputs: [{ name: "", internalType: "address", type: "address" }],
+    name: "proxiableUUID",
+    outputs: [{ name: "", internalType: "bytes32", type: "bytes32" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
-    name: "passPeriod",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "pause",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "paused",
-    outputs: [{ name: "", internalType: "bool", type: "bool" }],
+    inputs: [
+      {
+        name: "arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+      },
+    ],
+    name: "rulers",
+    outputs: [{ name: "ruler", internalType: "address", type: "address" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [],
-    name: "pinakion",
-    outputs: [{ name: "", internalType: "contract IERC20", type: "address" }],
+    inputs: [{ name: "disputeID", internalType: "uint256", type: "uint256" }],
+    name: "rulingResults",
+    outputs: [
+      { name: "ruling", internalType: "uint256", type: "uint256" },
+      { name: "tied", internalType: "bool", type: "bool" },
+      { name: "overridden", internalType: "bool", type: "bool" },
+    ],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [],
-    name: "proxiableUUID",
-    outputs: [{ name: "", internalType: "bytes32", type: "bytes32" }],
+    inputs: [
+      {
+        name: "arbitrable",
+        internalType: "contract IArbitrableV2",
+        type: "address",
+      },
+    ],
+    name: "settings",
+    outputs: [
+      {
+        name: "rulingMode",
+        internalType: "enum KlerosCoreRuler.RulingMode",
+        type: "uint8",
+      },
+      { name: "presetRuling", internalType: "uint256", type: "uint256" },
+      { name: "presetTied", internalType: "bool", type: "bool" },
+      { name: "presetOverridden", internalType: "bool", type: "bool" },
+    ],
     stateMutability: "view",
   },
-  {
-    type: "function",
-    inputs: [{ name: "_wNative", internalType: "address", type: "address" }],
-    name: "reinitialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
   {
     type: "function",
     inputs: [
-      { name: "_courtID", internalType: "uint96", type: "uint96" },
-      { name: "_newStake", internalType: "uint256", type: "uint256" },
+      { name: "newImplementation", internalType: "address", type: "address" },
+      { name: "data", internalType: "bytes", type: "bytes" },
     ],
-    name: "setStake",
+    name: "upgradeToAndCall",
     outputs: [],
-    stateMutability: "nonpayable",
+    stateMutability: "payable",
   },
   {
-    type: "function",
+    type: "constructor",
     inputs: [
-      { name: "_account", internalType: "address", type: "address" },
-      { name: "_courtID", internalType: "uint96", type: "uint96" },
-      { name: "_newStake", internalType: "uint256", type: "uint256" },
-    ],
-    name: "setStakeBySortitionModule",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "sortitionModule",
-    outputs: [{ name: "", internalType: "contract ISortitionModule", type: "address" }],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    inputs: [
-      { name: "_account", internalType: "address", type: "address" },
-      { name: "_amount", internalType: "uint256", type: "uint256" },
-    ],
-    name: "transferBySortitionModule",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "unpause",
-    outputs: [],
-    stateMutability: "nonpayable",
-  },
-  {
-    type: "function",
-    inputs: [
-      { name: "newImplementation", internalType: "address", type: "address" },
-      { name: "data", internalType: "bytes", type: "bytes" },
-    ],
-    name: "upgradeToAndCall",
-    outputs: [],
-    stateMutability: "payable",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "version",
-    outputs: [{ name: "", internalType: "string", type: "string" }],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "wNative",
-    outputs: [{ name: "", internalType: "address", type: "address" }],
-    stateMutability: "view",
-  },
-] as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xC1210493804eEF123096F9581Ee82B915150E54c)
- */
-export const klerosCoreNeoImplementationAddress = {
-  42161: "0xC1210493804eEF123096F9581Ee82B915150E54c",
-} as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xC1210493804eEF123096F9581Ee82B915150E54c)
- */
-export const klerosCoreNeoImplementationConfig = {
-  address: klerosCoreNeoImplementationAddress,
-  abi: klerosCoreNeoImplementationAbi,
-} as const;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreNeo_Proxy
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
- */
-export const klerosCoreNeoProxyAbi = [
-  {
-    type: "constructor",
-    inputs: [
-      { name: "_implementation", internalType: "address", type: "address" },
-      { name: "_data", internalType: "bytes", type: "bytes" },
+      { name: "_implementation", internalType: "address", type: "address" },
+      { name: "_data", internalType: "bytes", type: "bytes" },
     ],
     stateMutability: "nonpayable",
   },
-  { type: "fallback", stateMutability: "payable" },
-  { type: "receive", stateMutability: "payable" },
 ] as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
  */
-export const klerosCoreNeoProxyAddress = {
-  42161: "0x991d2df165670b9cac3B022f4B68D65b664222ea",
+export const klerosCoreRulerAddress = {
+  42161: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
 } as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
  */
-export const klerosCoreNeoProxyConfig = {
-  address: klerosCoreNeoProxyAddress,
-  abi: klerosCoreNeoProxyAbi,
+export const klerosCoreRulerConfig = {
+  address: klerosCoreRulerAddress,
+  abi: klerosCoreRulerAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreRulerNeo
+// KlerosCoreRuler_Implementation
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
  */
-export const klerosCoreRulerNeoAbi = [
-  { type: "fallback", stateMutability: "payable" },
-  { type: "receive", stateMutability: "payable" },
+export const klerosCoreRulerImplementationAbi = [
+  { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "AppealFeesNotEnough" },
   { type: "error", inputs: [], name: "ArbitrationFeesNotEnough" },
@@ -12022,6 +11771,31 @@ export const klerosCoreRulerNeoAbi = [
     outputs: [],
     stateMutability: "payable",
   },
+] as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
+ */
+export const klerosCoreRulerImplementationAddress = {
+  42161: "0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324",
+} as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
+ */
+export const klerosCoreRulerImplementationConfig = {
+  address: klerosCoreRulerImplementationAddress,
+  abi: klerosCoreRulerImplementationAbi,
+} as const;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// KlerosCoreRuler_Proxy
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
+ */
+export const klerosCoreRulerProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -12030,50 +11804,161 @@ export const klerosCoreRulerNeoAbi = [
     ],
     stateMutability: "nonpayable",
   },
+  { type: "fallback", stateMutability: "payable" },
+  { type: "receive", stateMutability: "payable" },
 ] as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
  */
-export const klerosCoreRulerNeoAddress = {
+export const klerosCoreRulerProxyAddress = {
   42161: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
  */
-export const klerosCoreRulerNeoConfig = {
-  address: klerosCoreRulerNeoAddress,
-  abi: klerosCoreRulerNeoAbi,
+export const klerosCoreRulerProxyConfig = {
+  address: klerosCoreRulerProxyAddress,
+  abi: klerosCoreRulerProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreRulerNeo_Implementation
+// KlerosCoreSnapshotProxy
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
+ */
+export const klerosCoreSnapshotProxyAbi = [
+  {
+    type: "constructor",
+    inputs: [
+      { name: "_governor", internalType: "address", type: "address" },
+      { name: "_core", internalType: "contract IKlerosCore", type: "address" },
+    ],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    inputs: [{ name: "_account", internalType: "address", type: "address" }],
+    name: "balanceOf",
+    outputs: [{ name: "totalStaked", internalType: "uint256", type: "uint256" }],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [{ name: "_core", internalType: "contract IKlerosCore", type: "address" }],
+    name: "changeCore",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    inputs: [{ name: "_governor", internalType: "address", type: "address" }],
+    name: "changeGovernor",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "core",
+    outputs: [{ name: "", internalType: "contract IKlerosCore", type: "address" }],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "decimals",
+    outputs: [{ name: "", internalType: "uint8", type: "uint8" }],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "governor",
+    outputs: [{ name: "", internalType: "address", type: "address" }],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "name",
+    outputs: [{ name: "", internalType: "string", type: "string" }],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "symbol",
+    outputs: [{ name: "", internalType: "string", type: "string" }],
+    stateMutability: "view",
+  },
+] as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
+ */
+export const klerosCoreSnapshotProxyAddress = {
+  42161: "0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95",
+} as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
+ */
+export const klerosCoreSnapshotProxyConfig = {
+  address: klerosCoreSnapshotProxyAddress,
+  abi: klerosCoreSnapshotProxyAbi,
+} as const;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// KlerosCore_Implementation
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xC1210493804eEF123096F9581Ee82B915150E54c)
  */
-export const klerosCoreRulerNeoImplementationAbi = [
+export const klerosCoreImplementationAbi = [
   { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "AppealFeesNotEnough" },
+  { type: "error", inputs: [], name: "AppealPeriodNotPassed" },
+  { type: "error", inputs: [], name: "ArbitrableNotWhitelisted" },
   { type: "error", inputs: [], name: "ArbitrationFeesNotEnough" },
+  { type: "error", inputs: [], name: "CannotDisableClassicDK" },
+  { type: "error", inputs: [], name: "CommitPeriodNotPassed" },
+  { type: "error", inputs: [], name: "DisputeKitNotSupportedByCourt" },
+  { type: "error", inputs: [], name: "DisputeKitOnly" },
   { type: "error", inputs: [], name: "DisputeNotAppealable" },
+  { type: "error", inputs: [], name: "DisputePeriodIsFinal" },
+  { type: "error", inputs: [], name: "DisputeStillDrawing" },
+  { type: "error", inputs: [], name: "EvidenceNotPassedAndNotAppeal" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
   { type: "error", inputs: [], name: "GovernorOnly" },
-  { type: "error", inputs: [], name: "GovernorOrInstructorOnly" },
+  { type: "error", inputs: [], name: "GuardianOrGovernorOnly" },
+  { type: "error", inputs: [], name: "InvalidDisputKitParent" },
   { type: "error", inputs: [], name: "InvalidForkingCourtAsParent" },
   {
     type: "error",
     inputs: [{ name: "implementation", internalType: "address", type: "address" }],
     name: "InvalidImplementation",
   },
-  { type: "error", inputs: [], name: "NoRulerSet" },
+  { type: "error", inputs: [], name: "MinStakeLowerThanParentCourt" },
+  { type: "error", inputs: [], name: "MustSupportDisputeKitClassic" },
+  { type: "error", inputs: [], name: "NotEligibleForStaking" },
+  { type: "error", inputs: [], name: "NotEvidencePeriod" },
+  { type: "error", inputs: [], name: "NotExecutionPeriod" },
   { type: "error", inputs: [], name: "NotInitializing" },
-  { type: "error", inputs: [], name: "RulerOnly" },
   { type: "error", inputs: [], name: "RulingAlreadyExecuted" },
-  { type: "error", inputs: [], name: "RulingModeNotSet" },
+  { type: "error", inputs: [], name: "SortitionModuleOnly" },
+  { type: "error", inputs: [], name: "StakingInTooManyCourts" },
+  { type: "error", inputs: [], name: "StakingLessThanCourtMinStake" },
+  { type: "error", inputs: [], name: "StakingMoreThanMaxStakePerJuror" },
+  { type: "error", inputs: [], name: "StakingMoreThanMaxTotalStaked" },
+  { type: "error", inputs: [], name: "StakingNotPossibleInThisCourt" },
+  { type: "error", inputs: [], name: "StakingTransferFailed" },
+  { type: "error", inputs: [], name: "StakingZeroWhenNoStake" },
   { type: "error", inputs: [], name: "TokenNotAccepted" },
   { type: "error", inputs: [], name: "TransferFailed" },
   { type: "error", inputs: [], name: "UUPSUnauthorizedCallContext" },
@@ -12082,7 +11967,13 @@ export const klerosCoreRulerNeoImplementationAbi = [
     inputs: [{ name: "slot", internalType: "bytes32", type: "bytes32" }],
     name: "UUPSUnsupportedProxiableUUID",
   },
+  { type: "error", inputs: [], name: "UnstakingTransferFailed" },
   { type: "error", inputs: [], name: "UnsuccessfulCall" },
+  { type: "error", inputs: [], name: "UnsupportedDisputeKit" },
+  { type: "error", inputs: [], name: "VotePeriodNotPassed" },
+  { type: "error", inputs: [], name: "WhenNotPausedOnly" },
+  { type: "error", inputs: [], name: "WhenPausedOnly" },
+  { type: "error", inputs: [], name: "WrongDisputeKitIndex" },
   {
     type: "event",
     anonymous: false,
@@ -12140,60 +12031,22 @@ export const klerosCoreRulerNeoImplementationAbi = [
     anonymous: false,
     inputs: [
       {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
+        name: "_courtID",
+        internalType: "uint96",
+        type: "uint96",
         indexed: true,
       },
       {
-        name: "mode",
-        internalType: "enum KlerosCoreRuler.RulingMode",
-        type: "uint8",
+        name: "_parent",
+        internalType: "uint96",
+        type: "uint96",
         indexed: true,
       },
       {
-        name: "_disputeID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_ruling",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: false,
-      },
-      { name: "tied", internalType: "bool", type: "bool", indexed: false },
-      {
-        name: "overridden",
-        internalType: "bool",
-        type: "bool",
-        indexed: false,
-      },
-    ],
-    name: "AutoRuled",
-  },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_courtID",
-        internalType: "uint256",
-        type: "uint256",
-        indexed: true,
-      },
-      {
-        name: "_parent",
-        internalType: "uint96",
-        type: "uint96",
-        indexed: true,
-      },
-      {
-        name: "_hiddenVotes",
-        internalType: "bool",
-        type: "bool",
-        indexed: false,
+        name: "_hiddenVotes",
+        internalType: "bool",
+        type: "bool",
+        indexed: false,
       },
       {
         name: "_minStake",
@@ -12225,6 +12078,12 @@ export const klerosCoreRulerNeoImplementationAbi = [
         type: "uint256[4]",
         indexed: false,
       },
+      {
+        name: "_supportedDisputeKits",
+        internalType: "uint256[]",
+        type: "uint256[]",
+        indexed: false,
+      },
     ],
     name: "CourtCreated",
   },
@@ -12327,6 +12186,107 @@ export const klerosCoreRulerNeoImplementationAbi = [
     ],
     name: "DisputeCreation",
   },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_disputeKitID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_disputeKitAddress",
+        internalType: "contract IDisputeKit",
+        type: "address",
+        indexed: true,
+      },
+    ],
+    name: "DisputeKitCreated",
+  },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_courtID",
+        internalType: "uint96",
+        type: "uint96",
+        indexed: true,
+      },
+      {
+        name: "_disputeKitID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      { name: "_enable", internalType: "bool", type: "bool", indexed: true },
+    ],
+    name: "DisputeKitEnabled",
+  },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_disputeID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_roundID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_fromDisputeKitID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_toDisputeKitID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: false,
+      },
+    ],
+    name: "DisputeKitJump",
+  },
+  {
+    type: "event",
+    anonymous: false,
+    inputs: [
+      {
+        name: "_address",
+        internalType: "address",
+        type: "address",
+        indexed: true,
+      },
+      {
+        name: "_disputeID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: true,
+      },
+      {
+        name: "_roundID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: false,
+      },
+      {
+        name: "_voteID",
+        internalType: "uint256",
+        type: "uint256",
+        indexed: false,
+      },
+    ],
+    name: "Draw",
+  },
   {
     type: "event",
     anonymous: false,
@@ -12414,67 +12374,14 @@ export const klerosCoreRulerNeoImplementationAbi = [
       },
       {
         name: "_period",
-        internalType: "enum KlerosCoreRuler.Period",
+        internalType: "enum KlerosCoreBase.Period",
         type: "uint8",
         indexed: false,
       },
     ],
     name: "NewPeriod",
   },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
-        indexed: true,
-      },
-      {
-        name: "_oldRuler",
-        internalType: "address",
-        type: "address",
-        indexed: true,
-      },
-      {
-        name: "_newRuler",
-        internalType: "address",
-        type: "address",
-        indexed: true,
-      },
-    ],
-    name: "RulerChanged",
-  },
-  {
-    type: "event",
-    anonymous: false,
-    inputs: [
-      {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
-        indexed: true,
-      },
-      {
-        name: "_settings",
-        internalType: "struct KlerosCoreRuler.RulerSettings",
-        type: "tuple",
-        components: [
-          {
-            name: "rulingMode",
-            internalType: "enum KlerosCoreRuler.RulingMode",
-            type: "uint8",
-          },
-          { name: "presetRuling", internalType: "uint256", type: "uint256" },
-          { name: "presetTied", internalType: "bool", type: "bool" },
-          { name: "presetOverridden", internalType: "bool", type: "bool" },
-        ],
-        indexed: false,
-      },
-    ],
-    name: "RulerSettingsChanged",
-  },
+  { type: "event", anonymous: false, inputs: [], name: "Paused" },
   {
     type: "event",
     anonymous: false,
@@ -12549,6 +12456,7 @@ export const klerosCoreRulerNeoImplementationAbi = [
     ],
     name: "TokenAndETHShift",
   },
+  { type: "event", anonymous: false, inputs: [], name: "Unpaused" },
   {
     type: "event",
     anonymous: false,
@@ -12562,13 +12470,25 @@ export const klerosCoreRulerNeoImplementationAbi = [
     ],
     name: "Upgraded",
   },
+  {
+    type: "function",
+    inputs: [
+      {
+        name: "_disputeKitAddress",
+        internalType: "contract IDisputeKit",
+        type: "address",
+      },
+    ],
+    name: "addNewDisputeKit",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
   {
     type: "function",
     inputs: [
       { name: "_disputeID", internalType: "uint256", type: "uint256" },
       { name: "_numberOfChoices", internalType: "uint256", type: "uint256" },
-      { name: "", internalType: "bytes", type: "bytes" },
-      { name: "_jump", internalType: "bool", type: "bool" },
+      { name: "_extraData", internalType: "bytes", type: "bytes" },
     ],
     name: "appeal",
     outputs: [],
@@ -12576,14 +12496,28 @@ export const klerosCoreRulerNeoImplementationAbi = [
   },
   {
     type: "function",
-    inputs: [
-      { name: "_disputeID", internalType: "uint256", type: "uint256" },
-      { name: "_jump", internalType: "bool", type: "bool" },
-    ],
+    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
     name: "appealCost",
     outputs: [{ name: "cost", internalType: "uint256", type: "uint256" }],
     stateMutability: "view",
   },
+  {
+    type: "function",
+    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
+    name: "appealPeriod",
+    outputs: [
+      { name: "start", internalType: "uint256", type: "uint256" },
+      { name: "end", internalType: "uint256", type: "uint256" },
+    ],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [{ name: "", internalType: "address", type: "address" }],
+    name: "arbitrableWhitelist",
+    outputs: [{ name: "", internalType: "bool", type: "bool" }],
+    stateMutability: "view",
+  },
   {
     type: "function",
     inputs: [
@@ -12611,6 +12545,16 @@ export const klerosCoreRulerNeoImplementationAbi = [
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    inputs: [
+      { name: "_arbitrable", internalType: "address", type: "address" },
+      { name: "_allowed", internalType: "bool", type: "bool" },
+    ],
+    name: "changeArbitrableWhitelist",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
   {
     type: "function",
     inputs: [
@@ -12650,22 +12594,15 @@ export const klerosCoreRulerNeoImplementationAbi = [
   },
   {
     type: "function",
-    inputs: [{ name: "_pinakion", internalType: "contract IERC20", type: "address" }],
-    name: "changePinakion",
+    inputs: [{ name: "_guardian", internalType: "address", type: "address" }],
+    name: "changeGuardian",
     outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [
-      {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
-      },
-      { name: "_newRuler", internalType: "address", type: "address" },
-    ],
-    name: "changeRuler",
+    inputs: [{ name: "_jurorNft", internalType: "contract IERC721", type: "address" }],
+    name: "changeJurorNft",
     outputs: [],
     stateMutability: "nonpayable",
   },
@@ -12673,28 +12610,19 @@ export const klerosCoreRulerNeoImplementationAbi = [
     type: "function",
     inputs: [
       {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
+        name: "_jurorProsecutionModule",
+        internalType: "address",
         type: "address",
       },
-      { name: "_presetRuling", internalType: "uint256", type: "uint256" },
-      { name: "_presetTied", internalType: "bool", type: "bool" },
-      { name: "_presetOverridden", internalType: "bool", type: "bool" },
     ],
-    name: "changeRulingModeToAutomaticPreset",
+    name: "changeJurorProsecutionModule",
     outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [
-      {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
-      },
-    ],
-    name: "changeRulingModeToAutomaticRandom",
+    inputs: [{ name: "_pinakion", internalType: "contract IERC20", type: "address" }],
+    name: "changePinakion",
     outputs: [],
     stateMutability: "nonpayable",
   },
@@ -12702,12 +12630,12 @@ export const klerosCoreRulerNeoImplementationAbi = [
     type: "function",
     inputs: [
       {
-        name: "_arbitrable",
-        internalType: "contract IArbitrableV2",
+        name: "_sortitionModule",
+        internalType: "contract ISortitionModule",
         type: "address",
       },
     ],
-    name: "changeRulingModeToManual",
+    name: "changeSortitionModule",
     outputs: [],
     stateMutability: "nonpayable",
   },
@@ -12750,6 +12678,12 @@ export const klerosCoreRulerNeoImplementationAbi = [
         internalType: "uint256[4]",
         type: "uint256[4]",
       },
+      { name: "_sortitionExtraData", internalType: "bytes", type: "bytes" },
+      {
+        name: "_supportedDisputeKits",
+        internalType: "uint256[]",
+        type: "uint256[]",
+      },
     ],
     name: "createCourt",
     outputs: [],
@@ -12799,6 +12733,13 @@ export const klerosCoreRulerNeoImplementationAbi = [
     ],
     stateMutability: "view",
   },
+  {
+    type: "function",
+    inputs: [{ name: "", internalType: "uint256", type: "uint256" }],
+    name: "disputeKits",
+    outputs: [{ name: "", internalType: "contract IDisputeKit", type: "address" }],
+    stateMutability: "view",
+  },
   {
     type: "function",
     inputs: [{ name: "", internalType: "uint256", type: "uint256" }],
@@ -12812,18 +12753,41 @@ export const klerosCoreRulerNeoImplementationAbi = [
       },
       {
         name: "period",
-        internalType: "enum KlerosCoreRuler.Period",
+        internalType: "enum KlerosCoreBase.Period",
         type: "uint8",
       },
       { name: "ruled", internalType: "bool", type: "bool" },
+      { name: "lastPeriodChange", internalType: "uint256", type: "uint256" },
     ],
     stateMutability: "view",
   },
+  {
+    type: "function",
+    inputs: [
+      { name: "_disputeID", internalType: "uint256", type: "uint256" },
+      { name: "_iterations", internalType: "uint256", type: "uint256" },
+    ],
+    name: "draw",
+    outputs: [{ name: "nbDrawnJurors", internalType: "uint256", type: "uint256" }],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    inputs: [
+      { name: "_courtID", internalType: "uint96", type: "uint96" },
+      { name: "_disputeKitIDs", internalType: "uint256[]", type: "uint256[]" },
+      { name: "_enable", internalType: "bool", type: "bool" },
+    ],
+    name: "enableDisputeKits",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
   {
     type: "function",
     inputs: [
       { name: "_disputeID", internalType: "uint256", type: "uint256" },
       { name: "_round", internalType: "uint256", type: "uint256" },
+      { name: "_iterations", internalType: "uint256", type: "uint256" },
     ],
     name: "execute",
     outputs: [],
@@ -12842,12 +12806,7 @@ export const klerosCoreRulerNeoImplementationAbi = [
   },
   {
     type: "function",
-    inputs: [
-      { name: "_disputeID", internalType: "uint256", type: "uint256" },
-      { name: "_ruling", internalType: "uint256", type: "uint256" },
-      { name: "tied", internalType: "bool", type: "bool" },
-      { name: "overridden", internalType: "bool", type: "bool" },
-    ],
+    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
     name: "executeRuling",
     outputs: [],
     stateMutability: "nonpayable",
@@ -12855,7 +12814,7 @@ export const klerosCoreRulerNeoImplementationAbi = [
   {
     type: "function",
     inputs: [],
-    name: "getNextDisputeID",
+    name: "getDisputeKitsLength",
     outputs: [{ name: "", internalType: "uint256", type: "uint256" }],
     stateMutability: "view",
   },
@@ -12873,6 +12832,16 @@ export const klerosCoreRulerNeoImplementationAbi = [
     outputs: [{ name: "", internalType: "uint256", type: "uint256" }],
     stateMutability: "view",
   },
+  {
+    type: "function",
+    inputs: [
+      { name: "_disputeID", internalType: "uint256", type: "uint256" },
+      { name: "_round", internalType: "uint256", type: "uint256" },
+    ],
+    name: "getPnkAtStakePerJuror",
+    outputs: [{ name: "", internalType: "uint256", type: "uint256" }],
+    stateMutability: "view",
+  },
   {
     type: "function",
     inputs: [
@@ -12883,24 +12852,40 @@ export const klerosCoreRulerNeoImplementationAbi = [
     outputs: [
       {
         name: "",
-        internalType: "struct KlerosCoreRuler.Round",
+        internalType: "struct KlerosCoreBase.Round",
         type: "tuple",
         components: [
+          { name: "disputeKitID", internalType: "uint256", type: "uint256" },
+          {
+            name: "pnkAtStakePerJuror",
+            internalType: "uint256",
+            type: "uint256",
+          },
           {
             name: "totalFeesForJurors",
             internalType: "uint256",
             type: "uint256",
           },
+          { name: "nbVotes", internalType: "uint256", type: "uint256" },
+          { name: "repartitions", internalType: "uint256", type: "uint256" },
+          { name: "pnkPenalties", internalType: "uint256", type: "uint256" },
+          { name: "drawnJurors", internalType: "address[]", type: "address[]" },
           {
             name: "sumFeeRewardPaid",
             internalType: "uint256",
             type: "uint256",
           },
+          {
+            name: "sumPnkRewardPaid",
+            internalType: "uint256",
+            type: "uint256",
+          },
           {
             name: "feeToken",
             internalType: "contract IERC20",
             type: "address",
           },
+          { name: "drawIterations", internalType: "uint256", type: "uint256" },
         ],
       },
     ],
@@ -12926,230 +12911,245 @@ export const klerosCoreRulerNeoImplementationAbi = [
     outputs: [{ name: "", internalType: "address", type: "address" }],
     stateMutability: "view",
   },
+  {
+    type: "function",
+    inputs: [],
+    name: "guardian",
+    outputs: [{ name: "", internalType: "address", type: "address" }],
+    stateMutability: "view",
+  },
   {
     type: "function",
     inputs: [
       { name: "_governor", internalType: "address", type: "address" },
+      { name: "_guardian", internalType: "address", type: "address" },
       { name: "_pinakion", internalType: "contract IERC20", type: "address" },
+      {
+        name: "_jurorProsecutionModule",
+        internalType: "address",
+        type: "address",
+      },
+      {
+        name: "_disputeKit",
+        internalType: "contract IDisputeKit",
+        type: "address",
+      },
+      { name: "_hiddenVotes", internalType: "bool", type: "bool" },
       {
         name: "_courtParameters",
         internalType: "uint256[4]",
         type: "uint256[4]",
       },
+      {
+        name: "_timesPerPeriod",
+        internalType: "uint256[4]",
+        type: "uint256[4]",
+      },
+      { name: "_sortitionExtraData", internalType: "bytes", type: "bytes" },
+      {
+        name: "_sortitionModuleAddress",
+        internalType: "contract ISortitionModule",
+        type: "address",
+      },
+      { name: "_jurorNft", internalType: "contract IERC721", type: "address" },
+      { name: "_wNative", internalType: "address", type: "address" },
     ],
     name: "initialize",
     outputs: [],
     stateMutability: "nonpayable",
   },
+  {
+    type: "function",
+    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
+    name: "isDisputeKitJumping",
+    outputs: [{ name: "", internalType: "bool", type: "bool" }],
+    stateMutability: "view",
+  },
+  {
+    type: "function",
+    inputs: [
+      { name: "_courtID", internalType: "uint96", type: "uint96" },
+      { name: "_disputeKitID", internalType: "uint256", type: "uint256" },
+    ],
+    name: "isSupported",
+    outputs: [{ name: "", internalType: "bool", type: "bool" }],
+    stateMutability: "view",
+  },
   {
     type: "function",
     inputs: [],
-    name: "pinakion",
-    outputs: [{ name: "", internalType: "contract IERC20", type: "address" }],
+    name: "jurorNft",
+    outputs: [{ name: "", internalType: "contract IERC721", type: "address" }],
     stateMutability: "view",
   },
   {
     type: "function",
     inputs: [],
-    name: "proxiableUUID",
-    outputs: [{ name: "", internalType: "bytes32", type: "bytes32" }],
+    name: "jurorProsecutionModule",
+    outputs: [{ name: "", internalType: "address", type: "address" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [
-      {
-        name: "arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
-      },
-    ],
-    name: "rulers",
-    outputs: [{ name: "ruler", internalType: "address", type: "address" }],
+    inputs: [{ name: "_disputeID", internalType: "uint256", type: "uint256" }],
+    name: "passPeriod",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "pause",
+    outputs: [],
+    stateMutability: "nonpayable",
+  },
+  {
+    type: "function",
+    inputs: [],
+    name: "paused",
+    outputs: [{ name: "", internalType: "bool", type: "bool" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [{ name: "disputeID", internalType: "uint256", type: "uint256" }],
-    name: "rulingResults",
-    outputs: [
-      { name: "ruling", internalType: "uint256", type: "uint256" },
-      { name: "tied", internalType: "bool", type: "bool" },
-      { name: "overridden", internalType: "bool", type: "bool" },
-    ],
+    inputs: [],
+    name: "pinakion",
+    outputs: [{ name: "", internalType: "contract IERC20", type: "address" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [
-      {
-        name: "arbitrable",
-        internalType: "contract IArbitrableV2",
-        type: "address",
-      },
-    ],
-    name: "settings",
-    outputs: [
-      {
-        name: "rulingMode",
-        internalType: "enum KlerosCoreRuler.RulingMode",
-        type: "uint8",
-      },
-      { name: "presetRuling", internalType: "uint256", type: "uint256" },
-      { name: "presetTied", internalType: "bool", type: "bool" },
-      { name: "presetOverridden", internalType: "bool", type: "bool" },
-    ],
+    inputs: [],
+    name: "proxiableUUID",
+    outputs: [{ name: "", internalType: "bytes32", type: "bytes32" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [
-      { name: "newImplementation", internalType: "address", type: "address" },
-      { name: "data", internalType: "bytes", type: "bytes" },
-    ],
-    name: "upgradeToAndCall",
+    inputs: [{ name: "_wNative", internalType: "address", type: "address" }],
+    name: "reinitialize",
     outputs: [],
-    stateMutability: "payable",
+    stateMutability: "nonpayable",
   },
-] as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
- */
-export const klerosCoreRulerNeoImplementationAddress = {
-  42161: "0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324",
-} as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x85093b5EDa4F2e2E2fEDae34Da91239D6a08e324)
- */
-export const klerosCoreRulerNeoImplementationConfig = {
-  address: klerosCoreRulerNeoImplementationAddress,
-  abi: klerosCoreRulerNeoImplementationAbi,
-} as const;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreRulerNeo_Proxy
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
- */
-export const klerosCoreRulerNeoProxyAbi = [
   {
-    type: "constructor",
+    type: "function",
     inputs: [
-      { name: "_implementation", internalType: "address", type: "address" },
-      { name: "_data", internalType: "bytes", type: "bytes" },
+      { name: "_courtID", internalType: "uint96", type: "uint96" },
+      { name: "_newStake", internalType: "uint256", type: "uint256" },
     ],
+    name: "setStake",
+    outputs: [],
     stateMutability: "nonpayable",
   },
-  { type: "fallback", stateMutability: "payable" },
-  { type: "receive", stateMutability: "payable" },
-] as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
- */
-export const klerosCoreRulerNeoProxyAddress = {
-  42161: "0xc0169e0B19aE02ac4fADD689260CF038726DFE13",
-} as const;
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xc0169e0B19aE02ac4fADD689260CF038726DFE13)
- */
-export const klerosCoreRulerNeoProxyConfig = {
-  address: klerosCoreRulerNeoProxyAddress,
-  abi: klerosCoreRulerNeoProxyAbi,
-} as const;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// KlerosCoreSnapshotProxy
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
- */
-export const klerosCoreSnapshotProxyAbi = [
   {
-    type: "constructor",
+    type: "function",
     inputs: [
-      { name: "_governor", internalType: "address", type: "address" },
-      { name: "_core", internalType: "contract IKlerosCore", type: "address" },
+      { name: "_account", internalType: "address", type: "address" },
+      { name: "_courtID", internalType: "uint96", type: "uint96" },
+      { name: "_newStake", internalType: "uint256", type: "uint256" },
     ],
+    name: "setStakeBySortitionModule",
+    outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [{ name: "_account", internalType: "address", type: "address" }],
-    name: "balanceOf",
-    outputs: [{ name: "totalStaked", internalType: "uint256", type: "uint256" }],
+    inputs: [],
+    name: "sortitionModule",
+    outputs: [{ name: "", internalType: "contract ISortitionModule", type: "address" }],
     stateMutability: "view",
   },
   {
     type: "function",
-    inputs: [{ name: "_core", internalType: "contract IKlerosCore", type: "address" }],
-    name: "changeCore",
+    inputs: [
+      { name: "_account", internalType: "address", type: "address" },
+      { name: "_amount", internalType: "uint256", type: "uint256" },
+    ],
+    name: "transferBySortitionModule",
     outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [{ name: "_governor", internalType: "address", type: "address" }],
-    name: "changeGovernor",
+    inputs: [],
+    name: "unpause",
     outputs: [],
     stateMutability: "nonpayable",
   },
   {
     type: "function",
-    inputs: [],
-    name: "core",
-    outputs: [{ name: "", internalType: "contract IKlerosCore", type: "address" }],
-    stateMutability: "view",
+    inputs: [
+      { name: "newImplementation", internalType: "address", type: "address" },
+      { name: "data", internalType: "bytes", type: "bytes" },
+    ],
+    name: "upgradeToAndCall",
+    outputs: [],
+    stateMutability: "payable",
   },
   {
     type: "function",
     inputs: [],
-    name: "decimals",
-    outputs: [{ name: "", internalType: "uint8", type: "uint8" }],
+    name: "version",
+    outputs: [{ name: "", internalType: "string", type: "string" }],
     stateMutability: "view",
   },
   {
     type: "function",
     inputs: [],
-    name: "governor",
+    name: "wNative",
     outputs: [{ name: "", internalType: "address", type: "address" }],
     stateMutability: "view",
   },
+] as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xC1210493804eEF123096F9581Ee82B915150E54c)
+ */
+export const klerosCoreImplementationAddress = {
+  42161: "0xC1210493804eEF123096F9581Ee82B915150E54c",
+} as const;
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xC1210493804eEF123096F9581Ee82B915150E54c)
+ */
+export const klerosCoreImplementationConfig = {
+  address: klerosCoreImplementationAddress,
+  abi: klerosCoreImplementationAbi,
+} as const;
+
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// KlerosCore_Proxy
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
+ */
+export const klerosCoreProxyAbi = [
   {
-    type: "function",
-    inputs: [],
-    name: "name",
-    outputs: [{ name: "", internalType: "string", type: "string" }],
-    stateMutability: "view",
-  },
-  {
-    type: "function",
-    inputs: [],
-    name: "symbol",
-    outputs: [{ name: "", internalType: "string", type: "string" }],
-    stateMutability: "view",
+    type: "constructor",
+    inputs: [
+      { name: "_implementation", internalType: "address", type: "address" },
+      { name: "_data", internalType: "bytes", type: "bytes" },
+    ],
+    stateMutability: "nonpayable",
   },
+  { type: "fallback", stateMutability: "payable" },
+  { type: "receive", stateMutability: "payable" },
 ] as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
  */
-export const klerosCoreSnapshotProxyAddress = {
-  42161: "0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95",
+export const klerosCoreProxyAddress = {
+  42161: "0x991d2df165670b9cac3B022f4B68D65b664222ea",
 } as const;
 
 /**
- * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0xEF719a5B3352F607e6C4E17b7e0cDAd8322fEC95)
+ * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x991d2df165670b9cac3B022f4B68D65b664222ea)
  */
-export const klerosCoreSnapshotProxyConfig = {
-  address: klerosCoreSnapshotProxyAddress,
-  abi: klerosCoreSnapshotProxyAbi,
+export const klerosCoreProxyConfig = {
+  address: klerosCoreProxyAddress,
+  abi: klerosCoreProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -14783,13 +14783,13 @@ export const randomizerRngProxyConfig = {
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// SortitionModuleNeo
+// SortitionModule
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D)
  */
-export const sortitionModuleNeoAbi = [
+export const sortitionModuleAbi = [
   { type: "fallback", stateMutability: "payable" },
   { type: "receive", stateMutability: "payable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
@@ -15405,26 +15405,26 @@ export const sortitionModuleNeoAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D)
  */
-export const sortitionModuleNeoAddress = {
+export const sortitionModuleAddress = {
   42161: "0x21A9402aDb818744B296e1d1BE58C804118DC03D",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D)
  */
-export const sortitionModuleNeoConfig = {
-  address: sortitionModuleNeoAddress,
-  abi: sortitionModuleNeoAbi,
+export const sortitionModuleConfig = {
+  address: sortitionModuleAddress,
+  abi: sortitionModuleAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// SortitionModuleNeo_Implementation
+// SortitionModule_Implementation
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x3f6D0daeD166b64FCfBb9bc7c9E26423c6C08eEE)
  */
-export const sortitionModuleNeoImplementationAbi = [
+export const sortitionModuleImplementationAbi = [
   { type: "constructor", inputs: [], stateMutability: "nonpayable" },
   { type: "error", inputs: [], name: "AlreadyInitialized" },
   { type: "error", inputs: [], name: "FailedDelegateCall" },
@@ -16031,26 +16031,26 @@ export const sortitionModuleNeoImplementationAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x3f6D0daeD166b64FCfBb9bc7c9E26423c6C08eEE)
  */
-export const sortitionModuleNeoImplementationAddress = {
+export const sortitionModuleImplementationAddress = {
   42161: "0x3f6D0daeD166b64FCfBb9bc7c9E26423c6C08eEE",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x3f6D0daeD166b64FCfBb9bc7c9E26423c6C08eEE)
  */
-export const sortitionModuleNeoImplementationConfig = {
-  address: sortitionModuleNeoImplementationAddress,
-  abi: sortitionModuleNeoImplementationAbi,
+export const sortitionModuleImplementationConfig = {
+  address: sortitionModuleImplementationAddress,
+  abi: sortitionModuleImplementationAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// SortitionModuleNeo_Proxy
+// SortitionModule_Proxy
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D)
  */
-export const sortitionModuleNeoProxyAbi = [
+export const sortitionModuleProxyAbi = [
   {
     type: "constructor",
     inputs: [
@@ -16066,16 +16066,16 @@ export const sortitionModuleNeoProxyAbi = [
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D)
  */
-export const sortitionModuleNeoProxyAddress = {
+export const sortitionModuleProxyAddress = {
   42161: "0x21A9402aDb818744B296e1d1BE58C804118DC03D",
 } as const;
 
 /**
  * [__View Contract on Arbitrum One Arbiscan__](https://arbiscan.io/address/0x21A9402aDb818744B296e1d1BE58C804118DC03D)
  */
-export const sortitionModuleNeoProxyConfig = {
-  address: sortitionModuleNeoProxyAddress,
-  abi: sortitionModuleNeoProxyAbi,
+export const sortitionModuleProxyConfig = {
+  address: sortitionModuleProxyAddress,
+  abi: sortitionModuleProxyAbi,
 } as const;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/contracts/deployments/utils.ts b/contracts/deployments/utils.ts
index e2711a377..a876fbd5a 100644
--- a/contracts/deployments/utils.ts
+++ b/contracts/deployments/utils.ts
@@ -10,7 +10,7 @@ export const deployments = {
   testnet: {
     chainId: arbitrumSepolia.id,
   },
-  mainnetNeo: {
+  mainnet: {
     chainId: arbitrum.id,
   },
 } as const;
diff --git a/contracts/package.json b/contracts/package.json
index 0bca4e700..fd40b404d 100644
--- a/contracts/package.json
+++ b/contracts/package.json
@@ -91,11 +91,11 @@
     "docbuild": "scripts/docPreprocess.sh && forge doc --build --out dist && scripts/docPostprocess.sh",
     "populate:courts:devnet": "hardhat populate:courts --from v2_devnet  --network arbitrumSepoliaDevnet",
     "populate:courts:testnet": "hardhat populate:courts --from v2_testnet  --network arbitrumSepolia",
-    "populate:courts:mainnetNeo": "hardhat populate:courts --core-type neo --from v2_mainnet_neo  --network arbitrum",
-    "populate:policiesUris": "scripts/setPoliciesURIs.sh config/policies.v2.{devnet,testnet,mainnet-neo}.json",
+    "populate:courts:mainnet": "hardhat populate:courts --from v2_mainnet  --network arbitrum",
+    "populate:policiesUris": "scripts/setPoliciesURIs.sh config/policies.v2.{devnet,testnet,mainnet}.json",
     "populate:policies:devnet": "hardhat populate:policy-registry --from v2_devnet --network arbitrumSepoliaDevnet",
     "populate:policies:testnet": "hardhat populate:policy-registry --from v2_testnet --network arbitrumSepolia",
-    "populate:policies:mainnetNeo": "hardhat populate:policy-registry --from v2_mainnet_neo --network arbitrum",
+    "populate:policies:mainnet": "hardhat populate:policy-registry --from v2_mainnet --network arbitrum",
     "release:patch": "scripts/publish.sh patch",
     "release:minor": "scripts/publish.sh minor",
     "release:major": "scripts/publish.sh major",
diff --git a/contracts/scripts/changeOwner.ts b/contracts/scripts/changeOwner.ts
index 72eeaeef7..fcb64137b 100644
--- a/contracts/scripts/changeOwner.ts
+++ b/contracts/scripts/changeOwner.ts
@@ -7,7 +7,7 @@ const { bold } = print.colors;
 
 task("change-owner", "Changes the owner for all the contracts")
   .addPositionalParam("newOwner", "The address of the new owner")
-  .addOptionalParam("coreType", "The type of core to use between base, neo, university (default: base)", Cores.BASE)
+  .addOptionalParam("coreType", "The type of core to use between base, university (default: base)", Cores.BASE)
   .setAction(async (taskArgs, hre) => {
     const newOwner = taskArgs.newOwner;
     if (!isAddress(newOwner)) {
@@ -27,7 +27,7 @@ task("change-owner", "Changes the owner for all the contracts")
 
     const coreType = Cores[taskArgs.coreType.toUpperCase() as keyof typeof Cores];
     if (coreType === undefined) {
-      console.error("Invalid core type, must be one of base, neo, university");
+      console.error("Invalid core type, must be one of base, university");
       return;
     }
     console.log("Using core type %s", coreType);
diff --git a/contracts/scripts/generateDeploymentArtifact.sh b/contracts/scripts/generateDeploymentArtifact.sh
index dedcf1c0b..6daf2a585 100755
--- a/contracts/scripts/generateDeploymentArtifact.sh
+++ b/contracts/scripts/generateDeploymentArtifact.sh
@@ -2,7 +2,7 @@
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-if [[ $# < 2 ]]
+if [[ $# -lt 2 ]]
 then
   echo "usage: $(basename $0) network address"
   exit 1
diff --git a/contracts/scripts/generateDeploymentsMarkdown.sh b/contracts/scripts/generateDeploymentsMarkdown.sh
index 6fa3c2932..5ae9dbf7f 100755
--- a/contracts/scripts/generateDeploymentsMarkdown.sh
+++ b/contracts/scripts/generateDeploymentsMarkdown.sh
@@ -15,6 +15,7 @@ IGNORED_ARTIFACTS=(
 function generate() { #deploymentDir #explorerUrl
     deploymentDir=$1
     explorerUrl=$2
+    # shellcheck disable=SC2068
     for f in $(ls -1 $deploymentDir/*.json 2>/dev/null | grep -v ${IGNORED_ARTIFACTS[@]/#/-e } | sort); do
         contractName=$(basename $f .json)
         address=$(cat $f | jq -r .address)
@@ -28,12 +29,12 @@ function generate() { #deploymentDir #explorerUrl
     done
 }
 
-echo "### V2 Neo (prelaunch)"
+echo "### V2 Mainnet"
 echo "#### Arbitrum One"
 echo
 generate "$SCRIPT_DIR/../deployments/arbitrum" "https://arbiscan.io/address/" | grep -v 'DAI\|WETH\|PNKFaucet'
 echo
-echo "### Official Testnet"
+echo "### V2 Testnet"
 echo "#### Arbitrum Sepolia"
 echo
 generate "$SCRIPT_DIR/../deployments/arbitrumSepolia" "https://sepolia.arbiscan.io/address/"
@@ -47,7 +48,7 @@ echo
 generate "$SCRIPT_DIR/../deployments/chiado" "https://gnosis-chiado.blockscout.com/address/"
 echo
 
-echo "### Devnet"
+echo "### V2 Devnet (unstable)"
 echo "#### Arbitrum Sepolia"
 echo
 generate "$SCRIPT_DIR/../deployments/arbitrumSepoliaDevnet" "https://sepolia.arbiscan.io/address/"
diff --git a/contracts/scripts/keeperBot.ts b/contracts/scripts/keeperBot.ts
index 593d97e4a..5d1b2751f 100644
--- a/contracts/scripts/keeperBot.ts
+++ b/contracts/scripts/keeperBot.ts
@@ -6,7 +6,6 @@ import {
   DisputeKitGatedShutter,
   DisputeKitShutter,
   SortitionModule,
-  SortitionModuleNeo,
 } from "../typechain-types";
 import env from "./utils/env";
 import loggerFactory from "./utils/logger";
@@ -49,7 +48,7 @@ const getContracts = async () => {
     throw new Error("University is not supported yet");
   }
   const contracts = await getContractsForCoreType(hre, coreType);
-  return { ...contracts, sortition: contracts.sortition as SortitionModule | SortitionModuleNeo };
+  return { ...contracts, sortition: contracts.sortition as SortitionModule };
 };
 
 type Contribution = {
@@ -277,9 +276,7 @@ const isRngReady = async () => {
       return true;
     }
   } else if (currentRng === blockHashRNG?.target && blockHashRNG !== null) {
-    const requestBlock = await sortition.randomNumberRequestBlock();
-    const lookahead = await sortition.rngLookahead();
-    const n = await blockHashRNG.receiveRandomness.staticCall(requestBlock + lookahead);
+    const n = await blockHashRNG.receiveRandomness.staticCall();
     if (Number(n) === 0) {
       logger.info("BlockHashRNG is NOT ready yet");
       return false;
diff --git a/contracts/scripts/keeperBotShutter.ts b/contracts/scripts/keeperBotShutter.ts
index 0b9724cae..fff463513 100644
--- a/contracts/scripts/keeperBotShutter.ts
+++ b/contracts/scripts/keeperBotShutter.ts
@@ -1,6 +1,6 @@
 import hre from "hardhat";
 import { getBytes } from "ethers";
-import { DisputeKitGatedShutter, DisputeKitShutter, SortitionModule, SortitionModuleNeo } from "../typechain-types";
+import { DisputeKitGatedShutter, DisputeKitShutter } from "../typechain-types";
 import { decrypt } from "./shutter";
 import env from "./utils/env";
 import loggerFactory from "./utils/logger";
@@ -312,8 +312,7 @@ const getContracts = async () => {
   if (coreType === Cores.UNIVERSITY) {
     throw new Error("University is not supported yet");
   }
-  const contracts = await getContractsForCoreType(hre, coreType);
-  return { ...contracts, sortition: contracts.sortition as SortitionModule | SortitionModuleNeo };
+  return await getContractsForCoreType(hre, coreType);
 };
 
 async function main() {
diff --git a/contracts/scripts/populateCourts.ts b/contracts/scripts/populateCourts.ts
index ee95dee71..cf86c9cbb 100644
--- a/contracts/scripts/populateCourts.ts
+++ b/contracts/scripts/populateCourts.ts
@@ -1,11 +1,11 @@
 import { task, types } from "hardhat/config";
-import { KlerosCore, KlerosCoreNeo, KlerosCoreUniversity } from "../typechain-types";
+import { KlerosCore, KlerosCoreUniversity } from "../typechain-types";
 import { BigNumberish, toBigInt, toNumber } from "ethers";
 import courtsV1Mainnet from "../config/courts.v1.mainnet.json";
 import courtsV1GnosisChain from "../config/courts.v1.gnosischain.json";
 import courtsV2ArbitrumTestnet from "../config/courts.v2.testnet.json";
 import courtsV2ArbitrumDevnet from "../config/courts.v2.devnet.json";
-import courtsV2MainnetNeo from "../config/courts.v2.mainnet-neo.json";
+import courtsV2Mainnet from "../config/courts.v2.mainnet.json";
 import { isDevnet } from "../deploy/utils";
 import { execute, writeTransactionBatch } from "./utils/execution";
 import { getContracts, Cores } from "./utils/contracts";
@@ -21,7 +21,7 @@ enum Sources {
   V1_GNOSIS,
   V2_DEVNET,
   V2_TESTNET,
-  V2_MAINNET_NEO,
+  V2_MAINNET,
 }
 
 type Court = {
@@ -43,7 +43,7 @@ const TEN_THOUSAND_GWEI = 10n ** 13n;
 task("populate:courts", "Populates the courts and their parameters")
   .addOptionalParam(
     "from",
-    "The source of the policies between v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet_neo (default: auto depending on the network)",
+    "The source of the policies between v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet (default: auto depending on the network)",
     undefined
   )
   .addOptionalParam("start", "The starting index for the courts to populate (default: 0)", 0, types.int)
@@ -53,7 +53,7 @@ task("populate:courts", "Populates the courts and their parameters")
     undefined,
     types.int
   )
-  .addOptionalParam("coreType", "The type of core to use between base, neo, university (default: base)", Cores.BASE)
+  .addOptionalParam("coreType", "The type of core to use between base, university (default: base)", Cores.BASE)
   .addFlag("reverse", "Iterates the courts in reverse order, useful to increase minStake in the child courts first")
   .addFlag("forceV1ParametersToDev", "Use development values for the v1 courts parameters")
   .setAction(async (taskArgs, hre) => {
@@ -74,7 +74,7 @@ task("populate:courts", "Populates the courts and their parameters")
     if (taskArgs.from) {
       from = Sources[taskArgs.from.toUpperCase() as keyof typeof Sources];
       if (from === undefined) {
-        console.error("Invalid source, must be one of v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet_neo");
+        console.error("Invalid source, must be one of v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet");
         return;
       }
     } else {
@@ -84,7 +84,7 @@ task("populate:courts", "Populates the courts and their parameters")
 
     const coreType = Cores[taskArgs.coreType.toUpperCase() as keyof typeof Cores];
     if (coreType === undefined) {
-      console.error("Invalid core type, must be one of base, neo, university");
+      console.error("Invalid core type, must be one of base, university");
       return;
     }
     console.log("Using core type %s", coreType);
@@ -133,8 +133,8 @@ task("populate:courts", "Populates the courts and their parameters")
         courtsV2 = courtsV2ArbitrumTestnet;
         break;
       }
-      case Sources.V2_MAINNET_NEO: {
-        courtsV2 = courtsV2MainnetNeo;
+      case Sources.V2_MAINNET: {
+        courtsV2 = courtsV2Mainnet;
         break;
       }
       default:
diff --git a/contracts/scripts/populatePolicyRegistry.ts b/contracts/scripts/populatePolicyRegistry.ts
index 6ffdacd8e..43087268a 100644
--- a/contracts/scripts/populatePolicyRegistry.ts
+++ b/contracts/scripts/populatePolicyRegistry.ts
@@ -4,7 +4,7 @@ import policiesV1Mainnet from "../config/policies.v1.mainnet.json";
 import policiesV1GnosisChain from "../config/policies.v1.gnosischain.json";
 import policiesV2ArbitrumTestnet from "../config/policies.v2.testnet.json";
 import policiesV2ArbitrumDevnet from "../config/policies.v2.devnet.json";
-import policiesV2MainnetNeo from "../config/policies.v2.mainnet-neo.json";
+import policiesV2Mainnet from "../config/policies.v2.mainnet.json";
 import { isDevnet } from "../deploy/utils";
 import { execute, writeTransactionBatch } from "./utils/execution";
 
@@ -19,13 +19,13 @@ enum Sources {
   V1_GNOSIS,
   V2_DEVNET,
   V2_TESTNET,
-  V2_MAINNET_NEO,
+  V2_MAINNET,
 }
 
 task("populate:policy-registry", "Populates the policy registry for each court")
   .addOptionalParam(
     "from",
-    "The source of the policies between v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet_neo (default: auto depending on the network)",
+    "The source of the policies between v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet (default: auto depending on the network)",
     undefined
   )
   .addOptionalParam("start", "The starting index for the courts to populate (default: 0)", 0, types.int)
@@ -53,7 +53,7 @@ task("populate:policy-registry", "Populates the policy registry for each court")
     if (taskArgs.from) {
       from = Sources[taskArgs.from.toUpperCase() as keyof typeof Sources];
       if (from === undefined) {
-        console.error("Invalid source, must be one of v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet_neo");
+        console.error("Invalid source, must be one of v1_mainnet, v1_gnosis, v2_devnet, v2_testnet, v2_mainnet");
         return;
       }
     } else {
@@ -88,8 +88,8 @@ task("populate:policy-registry", "Populates the policy registry for each court")
         policiesV2 = policiesV2ArbitrumTestnet;
         break;
       }
-      case Sources.V2_MAINNET_NEO: {
-        policiesV2 = policiesV2MainnetNeo;
+      case Sources.V2_MAINNET: {
+        policiesV2 = policiesV2Mainnet;
         break;
       }
       default:
diff --git a/contracts/scripts/storage-layout.ts b/contracts/scripts/storage-layout.ts
index 697b7d48f..70cf166e7 100644
--- a/contracts/scripts/storage-layout.ts
+++ b/contracts/scripts/storage-layout.ts
@@ -4,7 +4,7 @@ import { HardhatRuntimeEnvironment } from "hardhat/types";
 task("storage-layout", "Prints the storage layout of a contract").setAction(
   async ({}, hre: HardhatRuntimeEnvironment) => {
     await hre.run("compile");
-    const buildInfo = await hre.artifacts.getBuildInfo(`src/arbitration/KlerosCoreNeo.sol:KlerosCoreNeo`);
-    console.log(buildInfo.output.contracts["src/arbitration/KlerosCoreNeo.sol"]["KlerosCoreNeo"].storageLayout);
+    const buildInfo = await hre.artifacts.getBuildInfo(`src/arbitration/KlerosCore.sol:KlerosCore`);
+    console.log(buildInfo.output.contracts["src/arbitration/KlerosCore.sol"]["KlerosCore"].storageLayout);
   }
 );
diff --git a/contracts/scripts/utils/contracts.ts b/contracts/scripts/utils/contracts.ts
index cc7bf2429..50bcac2f6 100644
--- a/contracts/scripts/utils/contracts.ts
+++ b/contracts/scripts/utils/contracts.ts
@@ -7,13 +7,11 @@ import {
   DisputeResolver,
   DisputeTemplateRegistry,
   KlerosCore,
-  KlerosCoreNeo,
   KlerosCoreUniversity,
   PNK,
   PolicyRegistry,
   RandomizerRNG,
   SortitionModule,
-  SortitionModuleNeo,
   SortitionModuleUniversity,
   TransactionBatcher,
   KlerosCoreSnapshotProxy,
@@ -24,28 +22,18 @@ import {
 
 export const Cores = {
   BASE: "BASE",
-  NEO: "NEO",
   UNIVERSITY: "UNIVERSITY",
 } as const;
 
 export type Core = (typeof Cores)[keyof typeof Cores];
 
 /**
- * Get contract names by specifying the coreType (BASE, NEO, UNIVERSITY).
+ * Get contract names by specifying the coreType (BASE, UNIVERSITY).
  * @param coreType - Core type
  * @returns Contract names
  */
 export const getContractNames = (coreType: Core) => {
   const coreSpecificNames = {
-    [Cores.NEO]: {
-      core: "KlerosCoreNeo",
-      sortition: "SortitionModuleNeo",
-      disputeKitClassic: "DisputeKitClassicNeo",
-      disputeKitShutter: "DisputeKitShutterNeo",
-      disputeKitGated: "DisputeKitGatedNeo",
-      disputeKitGatedShutter: "DisputeKitGatedShutterNeo",
-      disputeResolver: "DisputeResolverNeo",
-    },
     [Cores.BASE]: {
       core: "KlerosCore",
       sortition: "SortitionModule",
@@ -66,7 +54,7 @@ export const getContractNames = (coreType: Core) => {
     },
   };
 
-  if (!(coreType in coreSpecificNames)) throw new Error("Invalid core type, must be one of BASE, NEO, or UNIVERSITY");
+  if (!(coreType in coreSpecificNames)) throw new Error("Invalid core type, must be one of BASE, or UNIVERSITY");
 
   return {
     ...coreSpecificNames[coreType],
@@ -83,20 +71,16 @@ export const getContractNames = (coreType: Core) => {
 };
 
 /**
- * Get contracts by specifying the coreType (BASE, NEO, UNIVERSITY).
+ * Get contracts by specifying the coreType (BASE, UNIVERSITY).
  * @param hre - Hardhat runtime environment
  * @param coreType - Core type
  * @returns Contracts
  */
 export const getContracts = async (hre: HardhatRuntimeEnvironment, coreType: Core) => {
   const { ethers } = hre;
-  let core: KlerosCore | KlerosCoreNeo | KlerosCoreUniversity;
-  let sortition: SortitionModule | SortitionModuleNeo | SortitionModuleUniversity;
+  let core: KlerosCore | KlerosCoreUniversity;
+  let sortition: SortitionModule | SortitionModuleUniversity;
   switch (coreType) {
-    case Cores.NEO:
-      core = await ethers.getContract<KlerosCoreNeo>(getContractNames(coreType).core);
-      sortition = await ethers.getContract<SortitionModuleNeo>(getContractNames(coreType).sortition);
-      break;
     case Cores.BASE:
       core = await ethers.getContract<KlerosCore>(getContractNames(coreType).core);
       sortition = await ethers.getContract<SortitionModule>(getContractNames(coreType).sortition);
@@ -106,7 +90,7 @@ export const getContracts = async (hre: HardhatRuntimeEnvironment, coreType: Cor
       sortition = await ethers.getContract<SortitionModuleUniversity>(getContractNames(coreType).sortition);
       break;
     default:
-      throw new Error("Invalid core type, must be one of BASE, NEO, or UNIVERSITY");
+      throw new Error("Invalid core type, must be one of BASE, or UNIVERSITY");
   }
   const disputeKitClassic = await ethers.getContract<DisputeKitClassic>(getContractNames(coreType).disputeKitClassic);
   const disputeKitShutter = await ethers.getContractOrNull<DisputeKitShutter>(
@@ -151,32 +135,28 @@ export const getContracts = async (hre: HardhatRuntimeEnvironment, coreType: Cor
 };
 
 /**
- * Get contracts by inferring the coreType (BASE, NEO, UNIVERSITY) from the network, most convenient for most cases.
+ * Get contracts by inferring the coreType (BASE, UNIVERSITY) from the network, most convenient for most cases.
  * @param hre - Hardhat runtime environment
  * @returns Contracts
  */
 export const getContractsFromNetwork = async (hre: HardhatRuntimeEnvironment) => {
   const { network } = hre;
-  if (network.name === "arbitrumSepoliaDevnet" || network.name === "arbitrumSepolia") {
+  if (["arbitrumSepoliaDevnet", "arbitrumSepolia", "arbitrum"].includes(network.name)) {
     return getContracts(hre, Cores.BASE);
-  } else if (network.name === "arbitrum") {
-    return getContracts(hre, Cores.NEO);
   } else {
     throw new Error("Invalid network");
   }
 };
 
 /**
- * Get contract names by inferring the coreType (BASE, NEO, UNIVERSITY) from the network, most convenient for most cases.
+ * Get contract names by inferring the coreType (BASE, UNIVERSITY) from the network, most convenient for most cases.
  * @param hre - Hardhat runtime environment
  * @returns Contract names
  */
 export const getContractNamesFromNetwork = async (hre: HardhatRuntimeEnvironment) => {
   const { network } = hre;
-  if (network.name === "arbitrumSepoliaDevnet" || network.name === "arbitrumSepolia") {
+  if (["arbitrumSepoliaDevnet", "arbitrumSepolia", "arbitrum"].includes(network.name)) {
     return getContractNames(Cores.BASE);
-  } else if (network.name === "arbitrum") {
-    return getContractNames(Cores.NEO);
   } else {
     throw new Error("Invalid network");
   }
diff --git a/contracts/src/arbitration/KlerosCore.sol b/contracts/src/arbitration/KlerosCore.sol
index 4dd30f61b..a8c78a910 100644
--- a/contracts/src/arbitration/KlerosCore.sol
+++ b/contracts/src/arbitration/KlerosCore.sol
@@ -2,14 +2,198 @@
 
 pragma solidity ^0.8.24;
 
-import {KlerosCoreBase, IDisputeKit, ISortitionModule, IERC20} from "./KlerosCoreBase.sol";
+import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
+import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
+import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
+import {Initializable} from "../proxy/Initializable.sol";
+import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
+import {SafeERC20, IERC20} from "../libraries/SafeERC20.sol";
+import {SafeSend} from "../libraries/SafeSend.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import "../libraries/Constants.sol";
 
 /// @title KlerosCore
 /// Core arbitrator contract for Kleros v2.
 /// Note that this contract trusts the PNK token, the dispute kit and the sortition module contracts.
-contract KlerosCore is KlerosCoreBase {
+contract KlerosCore is IArbitratorV2, Initializable, UUPSProxiable {
+    using SafeERC20 for IERC20;
+    using SafeSend for address payable;
+
     string public constant override version = "2.0.0";
 
+    // ************************************* //
+    // *         Enums / Structs           * //
+    // ************************************* //
+
+    enum Period {
+        evidence, // Evidence can be submitted. This is also when drawing has to take place.
+        commit, // Jurors commit a hashed vote. This is skipped for courts without hidden votes.
+        vote, // Jurors reveal/cast their vote depending on whether the court has hidden votes or not.
+        appeal, // The dispute can be appealed.
+        execution // Tokens are redistributed and the ruling is executed.
+    }
+
+    struct Court {
+        uint96 parent; // The parent court.
+        bool hiddenVotes; // Whether to use commit and reveal or not.
+        uint256[] children; // List of child courts.
+        uint256 minStake; // Minimum PNKs needed to stake in the court.
+        uint256 alpha; // Basis point of PNKs that are lost when incoherent.
+        uint256 feeForJuror; // Arbitration fee paid per juror.
+        uint256 jurorsForCourtJump; // The appeal after the one that reaches this number of jurors will go to the parent court if any.
+        uint256[4] timesPerPeriod; // The time allotted to each dispute period in the form `timesPerPeriod[period]`.
+        mapping(uint256 disputeKitId => bool) supportedDisputeKits; // True if DK with this ID is supported by the court. Note that each court must support classic dispute kit.
+        bool disabled; // True if the court is disabled. Unused for now, will be implemented later.
+    }
+
+    struct Dispute {
+        uint96 courtID; // The ID of the court the dispute is in.
+        IArbitrableV2 arbitrated; // The arbitrable contract.
+        Period period; // The current period of the dispute.
+        bool ruled; // True if the ruling has been executed, false otherwise.
+        uint256 lastPeriodChange; // The last time the period was changed.
+        Round[] rounds;
+    }
+
+    struct Round {
+        uint256 disputeKitID; // Index of the dispute kit in the array.
+        uint256 pnkAtStakePerJuror; // The amount of PNKs at stake for each juror in this round.
+        uint256 totalFeesForJurors; // The total juror fees paid in this round.
+        uint256 nbVotes; // The total number of votes the dispute can possibly have in the current round. Former votes[_round].length.
+        uint256 repartitions; // A counter of reward repartitions made in this round.
+        uint256 pnkPenalties; // The amount of PNKs collected from penalties in this round.
+        address[] drawnJurors; // Addresses of the jurors that were drawn in this round.
+        uint96[] drawnJurorFromCourtIDs; // The courtIDs where the juror was drawn from, possibly their stake in a subcourt.
+        uint256 sumFeeRewardPaid; // Total sum of arbitration fees paid to coherent jurors as a reward in this round.
+        uint256 sumPnkRewardPaid; // Total sum of PNK paid to coherent jurors as a reward in this round.
+        IERC20 feeToken; // The token used for paying fees in this round.
+        uint256 drawIterations; // The number of iterations passed drawing the jurors for this round.
+    }
+
+    // Workaround "stack too deep" errors
+    struct ExecuteParams {
+        uint256 disputeID; // The ID of the dispute to execute.
+        uint256 round; // The round to execute.
+        uint256 coherentCount; // The number of coherent votes in the round.
+        uint256 numberOfVotesInRound; // The number of votes in the round.
+        uint256 feePerJurorInRound; // The fee per juror in the round.
+        uint256 pnkAtStakePerJurorInRound; // The amount of PNKs at stake for each juror in the round.
+        uint256 pnkPenaltiesInRound; // The amount of PNKs collected from penalties in the round.
+        uint256 repartition; // The index of the repartition to execute.
+    }
+
+    struct CurrencyRate {
+        bool feePaymentAccepted;
+        uint64 rateInEth;
+        uint8 rateDecimals;
+    }
+
+    // ************************************* //
+    // *             Storage               * //
+    // ************************************* //
+
+    uint256 private constant NON_PAYABLE_AMOUNT = (2 ** 256 - 2) / 2; // An amount higher than the supply of ETH.
+
+    address public owner; // The owner of the contract.
+    address public guardian; // The guardian able to pause asset withdrawals.
+    IERC20 public pinakion; // The Pinakion token contract.
+    address public jurorProsecutionModule; // The module for juror's prosecution.
+    ISortitionModule public sortitionModule; // Sortition module for drawing.
+    Court[] public courts; // The courts.
+    IDisputeKit[] public disputeKits; // Array of dispute kits.
+    Dispute[] public disputes; // The disputes.
+    mapping(IERC20 => CurrencyRate) public currencyRates; // The price of each token in ETH.
+    bool public paused; // Whether asset withdrawals are paused.
+    address public wNative; // The wrapped native token for safeSend().
+    mapping(address => bool) public arbitrableWhitelist; // Arbitrable whitelist.
+    bool public arbitrableWhitelistEnabled; // Whether the arbitrable whitelist is enabled.
+    IERC721 public jurorNft; // Eligible jurors NFT.
+
+    // ************************************* //
+    // *              Events               * //
+    // ************************************* //
+
+    event NewPeriod(uint256 indexed _disputeID, Period _period);
+    event AppealPossible(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
+    event AppealDecision(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
+    event Draw(address indexed _address, uint256 indexed _disputeID, uint256 _roundID, uint256 _voteID);
+    event CourtCreated(
+        uint96 indexed _courtID,
+        uint96 indexed _parent,
+        bool _hiddenVotes,
+        uint256 _minStake,
+        uint256 _alpha,
+        uint256 _feeForJuror,
+        uint256 _jurorsForCourtJump,
+        uint256[4] _timesPerPeriod,
+        uint256[] _supportedDisputeKits
+    );
+    event CourtModified(
+        uint96 indexed _courtID,
+        bool _hiddenVotes,
+        uint256 _minStake,
+        uint256 _alpha,
+        uint256 _feeForJuror,
+        uint256 _jurorsForCourtJump,
+        uint256[4] _timesPerPeriod
+    );
+    event DisputeKitCreated(uint256 indexed _disputeKitID, IDisputeKit indexed _disputeKitAddress);
+    event DisputeKitEnabled(uint96 indexed _courtID, uint256 indexed _disputeKitID, bool indexed _enable);
+    event CourtJump(
+        uint256 indexed _disputeID,
+        uint256 indexed _roundID,
+        uint96 indexed _fromCourtID,
+        uint96 _toCourtID
+    );
+    event DisputeKitJump(
+        uint256 indexed _disputeID,
+        uint256 indexed _roundID,
+        uint256 indexed _fromDisputeKitID,
+        uint256 _toDisputeKitID
+    );
+    event TokenAndETHShift(
+        address indexed _account,
+        uint256 indexed _disputeID,
+        uint256 indexed _roundID,
+        uint256 _degreeOfCoherency,
+        int256 _pnkAmount,
+        int256 _feeAmount,
+        IERC20 _feeToken
+    );
+    event LeftoverRewardSent(
+        uint256 indexed _disputeID,
+        uint256 indexed _roundID,
+        uint256 _pnkAmount,
+        uint256 _feeAmount,
+        IERC20 _feeToken
+    );
+    event Paused();
+    event Unpaused();
+
+    // ************************************* //
+    // *        Function Modifiers         * //
+    // ************************************* //
+
+    modifier onlyByOwner() {
+        if (owner != msg.sender) revert OwnerOnly();
+        _;
+    }
+
+    modifier onlyByGuardianOrOwner() {
+        if (guardian != msg.sender && owner != msg.sender) revert GuardianOrOwnerOnly();
+        _;
+    }
+
+    modifier whenPaused() {
+        if (!paused) revert WhenPausedOnly();
+        _;
+    }
+
+    modifier whenNotPaused() {
+        if (paused) revert WhenNotPausedOnly();
+        _;
+    }
+
     // ************************************* //
     // *            Constructor            * //
     // ************************************* //
@@ -31,6 +215,7 @@ contract KlerosCore is KlerosCoreBase {
     /// @param _sortitionExtraData The extra data for sortition module.
     /// @param _sortitionModuleAddress The sortition module responsible for sortition of the jurors.
     /// @param _wNative The wrapped native token address, typically wETH.
+    /// @param _jurorNft NFT contract to vet the jurors.
     function initialize(
         address _owner,
         address _guardian,
@@ -42,21 +227,57 @@ contract KlerosCore is KlerosCoreBase {
         uint256[4] memory _timesPerPeriod,
         bytes memory _sortitionExtraData,
         ISortitionModule _sortitionModuleAddress,
-        address _wNative
+        address _wNative,
+        IERC721 _jurorNft
     ) external initializer {
-        __KlerosCoreBase_initialize(
-            _owner,
-            _guardian,
-            _pinakion,
-            _jurorProsecutionModule,
-            _disputeKit,
+        owner = _owner;
+        guardian = _guardian;
+        pinakion = _pinakion;
+        jurorProsecutionModule = _jurorProsecutionModule;
+        sortitionModule = _sortitionModuleAddress;
+        wNative = _wNative;
+        jurorNft = _jurorNft;
+
+        // NULL_DISPUTE_KIT: an empty element at index 0 to indicate when a dispute kit is not supported.
+        disputeKits.push();
+
+        // DISPUTE_KIT_CLASSIC
+        disputeKits.push(_disputeKit);
+
+        emit DisputeKitCreated(DISPUTE_KIT_CLASSIC, _disputeKit);
+
+        // FORKING_COURT
+        // TODO: Fill the properties for the Forking court, emit CourtCreated.
+        courts.push();
+        sortitionModule.createTree(FORKING_COURT, _sortitionExtraData);
+
+        // GENERAL_COURT
+        Court storage court = courts.push();
+        court.parent = FORKING_COURT;
+        court.children = new uint256[](0);
+        court.hiddenVotes = _hiddenVotes;
+        court.minStake = _courtParameters[0];
+        court.alpha = _courtParameters[1];
+        court.feeForJuror = _courtParameters[2];
+        court.jurorsForCourtJump = _courtParameters[3];
+        court.timesPerPeriod = _timesPerPeriod;
+
+        sortitionModule.createTree(GENERAL_COURT, _sortitionExtraData);
+
+        uint256[] memory supportedDisputeKits = new uint256[](1);
+        supportedDisputeKits[0] = DISPUTE_KIT_CLASSIC;
+        emit CourtCreated(
+            GENERAL_COURT,
+            court.parent,
             _hiddenVotes,
-            _courtParameters,
+            _courtParameters[0],
+            _courtParameters[1],
+            _courtParameters[2],
+            _courtParameters[3],
             _timesPerPeriod,
-            _sortitionExtraData,
-            _sortitionModuleAddress,
-            _wNative
+            supportedDisputeKits
         );
+        _enableDisputeKit(GENERAL_COURT, DISPUTE_KIT_CLASSIC, true);
     }
 
     // ************************************* //
@@ -68,4 +289,1045 @@ contract KlerosCore is KlerosCoreBase {
     function _authorizeUpgrade(address) internal view override onlyByOwner {
         // NOP
     }
+
+    /// @dev Pause staking and reward execution. Can only be done by guardian or owner.
+    function pause() external onlyByGuardianOrOwner whenNotPaused {
+        paused = true;
+        emit Paused();
+    }
+
+    /// @dev Unpause staking and reward execution. Can only be done by owner.
+    function unpause() external onlyByOwner whenPaused {
+        paused = false;
+        emit Unpaused();
+    }
+
+    /// @dev Allows the owner to call anything on behalf of the contract.
+    /// @param _destination The destination of the call.
+    /// @param _amount The value sent with the call.
+    /// @param _data The data sent with the call.
+    function executeOwnerProposal(address _destination, uint256 _amount, bytes memory _data) external onlyByOwner {
+        (bool success, ) = _destination.call{value: _amount}(_data);
+        if (!success) revert UnsuccessfulCall();
+    }
+
+    /// @dev Changes the `owner` storage variable.
+    /// @param _owner The new value for the `owner` storage variable.
+    function changeOwner(address payable _owner) external onlyByOwner {
+        owner = _owner;
+    }
+
+    /// @dev Changes the `guardian` storage variable.
+    /// @param _guardian The new value for the `guardian` storage variable.
+    function changeGuardian(address _guardian) external onlyByOwner {
+        guardian = _guardian;
+    }
+
+    /// @dev Changes the `pinakion` storage variable.
+    /// @param _pinakion The new value for the `pinakion` storage variable.
+    function changePinakion(IERC20 _pinakion) external onlyByOwner {
+        pinakion = _pinakion;
+    }
+
+    /// @dev Changes the `jurorProsecutionModule` storage variable.
+    /// @param _jurorProsecutionModule The new value for the `jurorProsecutionModule` storage variable.
+    function changeJurorProsecutionModule(address _jurorProsecutionModule) external onlyByOwner {
+        jurorProsecutionModule = _jurorProsecutionModule;
+    }
+
+    /// @dev Changes the `_sortitionModule` storage variable.
+    /// Note that the new module should be initialized for all courts.
+    /// @param _sortitionModule The new value for the `sortitionModule` storage variable.
+    function changeSortitionModule(ISortitionModule _sortitionModule) external onlyByOwner {
+        sortitionModule = _sortitionModule;
+    }
+
+    /// @dev Add a new supported dispute kit module to the court.
+    /// @param _disputeKitAddress The address of the dispute kit contract.
+    function addNewDisputeKit(IDisputeKit _disputeKitAddress) external onlyByOwner {
+        uint256 disputeKitID = disputeKits.length;
+        disputeKits.push(_disputeKitAddress);
+        emit DisputeKitCreated(disputeKitID, _disputeKitAddress);
+    }
+
+    /// @dev Creates a court under a specified parent court.
+    /// @param _parent The `parent` property value of the court.
+    /// @param _hiddenVotes The `hiddenVotes` property value of the court.
+    /// @param _minStake The `minStake` property value of the court.
+    /// @param _alpha The `alpha` property value of the court.
+    /// @param _feeForJuror The `feeForJuror` property value of the court.
+    /// @param _jurorsForCourtJump The `jurorsForCourtJump` property value of the court.
+    /// @param _timesPerPeriod The `timesPerPeriod` property value of the court.
+    /// @param _sortitionExtraData Extra data for sortition module.
+    /// @param _supportedDisputeKits Indexes of dispute kits that this court will support.
+    function createCourt(
+        uint96 _parent,
+        bool _hiddenVotes,
+        uint256 _minStake,
+        uint256 _alpha,
+        uint256 _feeForJuror,
+        uint256 _jurorsForCourtJump,
+        uint256[4] memory _timesPerPeriod,
+        bytes memory _sortitionExtraData,
+        uint256[] memory _supportedDisputeKits
+    ) external onlyByOwner {
+        if (courts[_parent].minStake > _minStake) revert MinStakeLowerThanParentCourt();
+        if (_supportedDisputeKits.length == 0) revert UnsupportedDisputeKit();
+        if (_parent == FORKING_COURT) revert InvalidForkingCourtAsParent();
+
+        uint96 courtID = uint96(courts.length);
+        Court storage court = courts.push();
+
+        for (uint256 i = 0; i < _supportedDisputeKits.length; i++) {
+            if (_supportedDisputeKits[i] == 0 || _supportedDisputeKits[i] >= disputeKits.length) {
+                revert WrongDisputeKitIndex();
+            }
+            _enableDisputeKit(uint96(courtID), _supportedDisputeKits[i], true);
+        }
+        // Check that Classic DK support was added.
+        if (!court.supportedDisputeKits[DISPUTE_KIT_CLASSIC]) revert MustSupportDisputeKitClassic();
+
+        court.parent = _parent;
+        court.children = new uint256[](0);
+        court.hiddenVotes = _hiddenVotes;
+        court.minStake = _minStake;
+        court.alpha = _alpha;
+        court.feeForJuror = _feeForJuror;
+        court.jurorsForCourtJump = _jurorsForCourtJump;
+        court.timesPerPeriod = _timesPerPeriod;
+
+        sortitionModule.createTree(courtID, _sortitionExtraData);
+
+        // Update the parent.
+        courts[_parent].children.push(courtID);
+        emit CourtCreated(
+            uint96(courtID),
+            _parent,
+            _hiddenVotes,
+            _minStake,
+            _alpha,
+            _feeForJuror,
+            _jurorsForCourtJump,
+            _timesPerPeriod,
+            _supportedDisputeKits
+        );
+    }
+
+    function changeCourtParameters(
+        uint96 _courtID,
+        bool _hiddenVotes,
+        uint256 _minStake,
+        uint256 _alpha,
+        uint256 _feeForJuror,
+        uint256 _jurorsForCourtJump,
+        uint256[4] memory _timesPerPeriod
+    ) external onlyByOwner {
+        Court storage court = courts[_courtID];
+        if (_courtID != GENERAL_COURT && courts[court.parent].minStake > _minStake) {
+            revert MinStakeLowerThanParentCourt();
+        }
+        for (uint256 i = 0; i < court.children.length; i++) {
+            if (courts[court.children[i]].minStake < _minStake) {
+                revert MinStakeLowerThanParentCourt();
+            }
+        }
+        court.minStake = _minStake;
+        court.hiddenVotes = _hiddenVotes;
+        court.alpha = _alpha;
+        court.feeForJuror = _feeForJuror;
+        court.jurorsForCourtJump = _jurorsForCourtJump;
+        court.timesPerPeriod = _timesPerPeriod;
+        emit CourtModified(
+            _courtID,
+            _hiddenVotes,
+            _minStake,
+            _alpha,
+            _feeForJuror,
+            _jurorsForCourtJump,
+            _timesPerPeriod
+        );
+    }
+
+    /// @dev Adds/removes court's support for specified dispute kits.
+    /// @param _courtID The ID of the court.
+    /// @param _disputeKitIDs The IDs of dispute kits which support should be added/removed.
+    /// @param _enable Whether add or remove the dispute kits from the court.
+    function enableDisputeKits(uint96 _courtID, uint256[] memory _disputeKitIDs, bool _enable) external onlyByOwner {
+        for (uint256 i = 0; i < _disputeKitIDs.length; i++) {
+            if (_enable) {
+                if (_disputeKitIDs[i] == 0 || _disputeKitIDs[i] >= disputeKits.length) {
+                    revert WrongDisputeKitIndex();
+                }
+                _enableDisputeKit(_courtID, _disputeKitIDs[i], true);
+            } else {
+                // Classic dispute kit must be supported by all courts.
+                if (_disputeKitIDs[i] == DISPUTE_KIT_CLASSIC) {
+                    revert CannotDisableClassicDK();
+                }
+                _enableDisputeKit(_courtID, _disputeKitIDs[i], false);
+            }
+        }
+    }
+
+    /// @dev Changes the supported fee tokens.
+    /// @param _feeToken The fee token.
+    /// @param _accepted Whether the token is supported or not as a method of fee payment.
+    function changeAcceptedFeeTokens(IERC20 _feeToken, bool _accepted) external onlyByOwner {
+        currencyRates[_feeToken].feePaymentAccepted = _accepted;
+        emit AcceptedFeeToken(_feeToken, _accepted);
+    }
+
+    /// @dev Changes the currency rate of a fee token.
+    /// @param _feeToken The fee token.
+    /// @param _rateInEth The new rate of the fee token in ETH.
+    /// @param _rateDecimals The new decimals of the fee token rate.
+    function changeCurrencyRates(IERC20 _feeToken, uint64 _rateInEth, uint8 _rateDecimals) external onlyByOwner {
+        currencyRates[_feeToken].rateInEth = _rateInEth;
+        currencyRates[_feeToken].rateDecimals = _rateDecimals;
+        emit NewCurrencyRate(_feeToken, _rateInEth, _rateDecimals);
+    }
+
+    /// @dev Changes the `jurorNft` storage variable.
+    /// @param _jurorNft The new value for the `jurorNft` storage variable.
+    function changeJurorNft(IERC721 _jurorNft) external onlyByOwner {
+        jurorNft = _jurorNft;
+    }
+
+    /// @dev Adds or removes an arbitrable from whitelist.
+    /// @param _arbitrable Arbitrable address.
+    /// @param _allowed Whether add or remove permission.
+    function changeArbitrableWhitelist(address _arbitrable, bool _allowed) external onlyByOwner {
+        arbitrableWhitelist[_arbitrable] = _allowed;
+    }
+
+    /// @dev Enables or disables the arbitrable whitelist.
+    function changeArbitrableWhitelistEnabled(bool _enabled) external onlyByOwner {
+        arbitrableWhitelistEnabled = _enabled;
+    }
+
+    // ************************************* //
+    // *         State Modifiers           * //
+    // ************************************* //
+
+    /// @dev Sets the caller's stake in a court.
+    /// @param _courtID The ID of the court.
+    /// @param _newStake The new stake.
+    /// Note that the existing delayed stake will be nullified as non-relevant.
+    function setStake(uint96 _courtID, uint256 _newStake) external whenNotPaused {
+        if (address(jurorNft) != address(0) && jurorNft.balanceOf(msg.sender) == 0) revert NotEligibleForStaking();
+        _setStake(msg.sender, _courtID, _newStake, false, OnError.Revert);
+    }
+
+    /// @dev Sets the stake of a specified account in a court without delaying stake changes, typically to apply a delayed stake or unstake inactive jurors.
+    /// @param _account The account whose stake is being set.
+    /// @param _courtID The ID of the court.
+    /// @param _newStake The new stake.
+    function setStakeBySortitionModule(address _account, uint96 _courtID, uint256 _newStake) external {
+        if (msg.sender != address(sortitionModule)) revert SortitionModuleOnly();
+        _setStake(_account, _courtID, _newStake, true, OnError.Return);
+    }
+
+    /// @dev Transfers PNK to the juror by SortitionModule.
+    /// @param _account The account of the juror whose PNK to transfer.
+    /// @param _amount The amount to transfer.
+    function transferBySortitionModule(address _account, uint256 _amount) external {
+        if (msg.sender != address(sortitionModule)) revert SortitionModuleOnly();
+        // Note eligibility is checked in SortitionModule.
+        pinakion.safeTransfer(_account, _amount);
+    }
+
+    /// @inheritdoc IArbitratorV2
+    function createDispute(
+        uint256 _numberOfChoices,
+        bytes memory _extraData
+    ) external payable override returns (uint256 disputeID) {
+        if (msg.value < arbitrationCost(_extraData)) revert ArbitrationFeesNotEnough();
+
+        return _createDispute(_numberOfChoices, _extraData, NATIVE_CURRENCY, msg.value);
+    }
+
+    /// @inheritdoc IArbitratorV2
+    function createDispute(
+        uint256 _numberOfChoices,
+        bytes calldata _extraData,
+        IERC20 _feeToken,
+        uint256 _feeAmount
+    ) external override returns (uint256 disputeID) {
+        if (!currencyRates[_feeToken].feePaymentAccepted) revert TokenNotAccepted();
+        if (_feeAmount < arbitrationCost(_extraData, _feeToken)) revert ArbitrationFeesNotEnough();
+
+        if (!_feeToken.safeTransferFrom(msg.sender, address(this), _feeAmount)) revert TransferFailed();
+        return _createDispute(_numberOfChoices, _extraData, _feeToken, _feeAmount);
+    }
+
+    function _createDispute(
+        uint256 _numberOfChoices,
+        bytes memory _extraData,
+        IERC20 _feeToken,
+        uint256 _feeAmount
+    ) internal returns (uint256 disputeID) {
+        if (arbitrableWhitelistEnabled && !arbitrableWhitelist[msg.sender]) revert ArbitrableNotWhitelisted();
+        (uint96 courtID, , uint256 disputeKitID) = _extraDataToCourtIDMinJurorsDisputeKit(_extraData);
+        if (!courts[courtID].supportedDisputeKits[disputeKitID]) revert DisputeKitNotSupportedByCourt();
+
+        disputeID = disputes.length;
+        Dispute storage dispute = disputes.push();
+        dispute.courtID = courtID;
+        dispute.arbitrated = IArbitrableV2(msg.sender);
+        dispute.lastPeriodChange = block.timestamp;
+
+        IDisputeKit disputeKit = disputeKits[disputeKitID];
+        Court storage court = courts[courtID];
+        Round storage round = dispute.rounds.push();
+
+        // Obtain the feeForJuror in the same currency as the _feeAmount
+        uint256 feeForJuror = (_feeToken == NATIVE_CURRENCY)
+            ? court.feeForJuror
+            : convertEthToTokenAmount(_feeToken, court.feeForJuror);
+        round.nbVotes = _feeAmount / feeForJuror;
+        round.disputeKitID = disputeKitID;
+        round.pnkAtStakePerJuror = _calculatePnkAtStake(court.minStake, court.alpha);
+        round.totalFeesForJurors = _feeAmount;
+        round.feeToken = IERC20(_feeToken);
+
+        sortitionModule.createDisputeHook(disputeID, 0); // Default round ID.
+
+        disputeKit.createDispute(disputeID, _numberOfChoices, _extraData, round.nbVotes);
+        emit DisputeCreation(disputeID, IArbitrableV2(msg.sender));
+    }
+
+    /// @dev Passes the period of a specified dispute.
+    /// @param _disputeID The ID of the dispute.
+    function passPeriod(uint256 _disputeID) external {
+        Dispute storage dispute = disputes[_disputeID];
+        Court storage court = courts[dispute.courtID];
+
+        uint256 currentRound = dispute.rounds.length - 1;
+        Round storage round = dispute.rounds[currentRound];
+        if (dispute.period == Period.evidence) {
+            if (
+                currentRound == 0 &&
+                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)]
+            ) {
+                revert EvidenceNotPassedAndNotAppeal();
+            }
+            if (round.drawnJurors.length != round.nbVotes) revert DisputeStillDrawing();
+            dispute.period = court.hiddenVotes ? Period.commit : Period.vote;
+        } else if (dispute.period == Period.commit) {
+            // Note that we do not want to pass to Voting period if all the commits are cast because it breaks the Shutter auto-reveal currently.
+            if (block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)]) {
+                revert CommitPeriodNotPassed();
+            }
+            dispute.period = Period.vote;
+        } else if (dispute.period == Period.vote) {
+            if (
+                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)] &&
+                !disputeKits[round.disputeKitID].areVotesAllCast(_disputeID)
+            ) {
+                revert VotePeriodNotPassed();
+            }
+            dispute.period = Period.appeal;
+            emit AppealPossible(_disputeID, dispute.arbitrated);
+        } else if (dispute.period == Period.appeal) {
+            if (
+                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)] &&
+                !disputeKits[round.disputeKitID].isAppealFunded(_disputeID)
+            ) {
+                revert AppealPeriodNotPassed();
+            }
+            dispute.period = Period.execution;
+        } else if (dispute.period == Period.execution) {
+            revert DisputePeriodIsFinal();
+        }
+
+        dispute.lastPeriodChange = block.timestamp;
+        emit NewPeriod(_disputeID, dispute.period);
+    }
+
+    /// @dev Draws jurors for the dispute. Can be called in parts.
+    /// @param _disputeID The ID of the dispute.
+    /// @param _iterations The number of iterations to run.
+    /// @return nbDrawnJurors The total number of jurors drawn in the round.
+    function draw(uint256 _disputeID, uint256 _iterations) external returns (uint256 nbDrawnJurors) {
+        Dispute storage dispute = disputes[_disputeID];
+        uint256 currentRound = dispute.rounds.length - 1;
+        Round storage round = dispute.rounds[currentRound];
+        if (dispute.period != Period.evidence) revert NotEvidencePeriod();
+
+        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
+
+        uint256 startIndex = round.drawIterations; // for gas: less storage reads
+        uint256 i;
+        while (i < _iterations && round.drawnJurors.length < round.nbVotes) {
+            (address drawnAddress, uint96 fromSubcourtID) = disputeKit.draw(_disputeID, startIndex + i++);
+            if (drawnAddress == address(0)) {
+                continue;
+            }
+            sortitionModule.lockStake(drawnAddress, round.pnkAtStakePerJuror);
+            emit Draw(drawnAddress, _disputeID, currentRound, round.drawnJurors.length);
+            round.drawnJurors.push(drawnAddress);
+            round.drawnJurorFromCourtIDs.push(fromSubcourtID != 0 ? fromSubcourtID : dispute.courtID);
+            if (round.drawnJurors.length == round.nbVotes) {
+                sortitionModule.postDrawHook(_disputeID, currentRound);
+            }
+        }
+        round.drawIterations += i;
+        return round.drawnJurors.length;
+    }
+
+    /// @dev Appeals the ruling of a specified dispute.
+    /// Note: Access restricted to the Dispute Kit for this `disputeID`.
+    /// @param _disputeID The ID of the dispute.
+    /// @param _numberOfChoices Number of choices for the dispute. Can be required during court jump.
+    /// @param _extraData Extradata for the dispute. Can be required during court jump.
+    function appeal(uint256 _disputeID, uint256 _numberOfChoices, bytes memory _extraData) external payable {
+        if (msg.value < appealCost(_disputeID)) revert AppealFeesNotEnough();
+
+        Dispute storage dispute = disputes[_disputeID];
+        if (dispute.period != Period.appeal) revert DisputeNotAppealable();
+
+        Round storage round = dispute.rounds[dispute.rounds.length - 1];
+        if (msg.sender != address(disputeKits[round.disputeKitID])) revert DisputeKitOnly();
+
+        // Warning: the extra round must be created before calling disputeKit.createDispute()
+        Round storage extraRound = dispute.rounds.push();
+
+        (uint96 newCourtID, uint256 newDisputeKitID, bool courtJump, ) = _getCourtAndDisputeKitJumps(
+            dispute,
+            round,
+            courts[dispute.courtID],
+            _disputeID
+        );
+        if (courtJump) {
+            emit CourtJump(_disputeID, dispute.rounds.length - 1, dispute.courtID, newCourtID);
+        }
+
+        dispute.courtID = newCourtID;
+        dispute.period = Period.evidence;
+        dispute.lastPeriodChange = block.timestamp;
+
+        Court storage court = courts[newCourtID];
+        extraRound.nbVotes = msg.value / court.feeForJuror; // As many votes that can be afforded by the provided funds.
+        extraRound.pnkAtStakePerJuror = _calculatePnkAtStake(court.minStake, court.alpha);
+        extraRound.totalFeesForJurors = msg.value;
+        extraRound.disputeKitID = newDisputeKitID;
+
+        sortitionModule.createDisputeHook(_disputeID, dispute.rounds.length - 1);
+
+        // Dispute kit was changed, so create a dispute in the new DK contract.
+        if (extraRound.disputeKitID != round.disputeKitID) {
+            emit DisputeKitJump(_disputeID, dispute.rounds.length - 1, round.disputeKitID, extraRound.disputeKitID);
+            disputeKits[extraRound.disputeKitID].createDispute(
+                _disputeID,
+                _numberOfChoices,
+                _extraData,
+                extraRound.nbVotes
+            );
+        }
+
+        emit AppealDecision(_disputeID, dispute.arbitrated);
+        emit NewPeriod(_disputeID, Period.evidence);
+    }
+
+    /// @dev Distribute the PNKs at stake and the dispute fees for the specific round of the dispute. Can be called in parts.
+    /// Note: Reward distributions are forbidden during pause.
+    /// @param _disputeID The ID of the dispute.
+    /// @param _round The appeal round.
+    /// @param _iterations The number of iterations to run.
+    function execute(uint256 _disputeID, uint256 _round, uint256 _iterations) external whenNotPaused {
+        Round storage round;
+        {
+            Dispute storage dispute = disputes[_disputeID];
+            if (dispute.period != Period.execution) revert NotExecutionPeriod();
+
+            round = dispute.rounds[_round];
+        } // stack too deep workaround
+
+        uint256 start = round.repartitions;
+        uint256 end = round.repartitions + _iterations;
+
+        uint256 pnkPenaltiesInRound = round.pnkPenalties; // Keep in memory to save gas.
+        uint256 numberOfVotesInRound = round.drawnJurors.length;
+        uint256 feePerJurorInRound = round.totalFeesForJurors / numberOfVotesInRound;
+        uint256 pnkAtStakePerJurorInRound = round.pnkAtStakePerJuror;
+        uint256 coherentCount;
+        {
+            IDisputeKit disputeKit = disputeKits[round.disputeKitID];
+            coherentCount = disputeKit.getCoherentCount(_disputeID, _round); // Total number of jurors that are eligible to a reward in this round.
+        } // stack too deep workaround
+
+        if (coherentCount == 0) {
+            // We loop over the votes once as there are no rewards because it is not a tie and no one in this round is coherent with the final outcome.
+            if (end > numberOfVotesInRound) end = numberOfVotesInRound;
+        } else {
+            // We loop over the votes twice, first to collect the PNK penalties, and second to distribute them as rewards along with arbitration fees.
+            if (end > numberOfVotesInRound * 2) end = numberOfVotesInRound * 2;
+        }
+        round.repartitions = end;
+
+        for (uint256 i = start; i < end; i++) {
+            if (i < numberOfVotesInRound) {
+                pnkPenaltiesInRound = _executePenalties(
+                    ExecuteParams({
+                        disputeID: _disputeID,
+                        round: _round,
+                        coherentCount: coherentCount,
+                        numberOfVotesInRound: numberOfVotesInRound,
+                        feePerJurorInRound: feePerJurorInRound,
+                        pnkAtStakePerJurorInRound: pnkAtStakePerJurorInRound,
+                        pnkPenaltiesInRound: pnkPenaltiesInRound,
+                        repartition: i
+                    })
+                );
+            } else {
+                _executeRewards(
+                    ExecuteParams({
+                        disputeID: _disputeID,
+                        round: _round,
+                        coherentCount: coherentCount,
+                        numberOfVotesInRound: numberOfVotesInRound,
+                        feePerJurorInRound: feePerJurorInRound,
+                        pnkAtStakePerJurorInRound: pnkAtStakePerJurorInRound,
+                        pnkPenaltiesInRound: pnkPenaltiesInRound,
+                        repartition: i
+                    })
+                );
+            }
+        }
+        if (round.pnkPenalties != pnkPenaltiesInRound) {
+            round.pnkPenalties = pnkPenaltiesInRound; // Reentrancy risk: breaks Check-Effect-Interact
+        }
+    }
+
+    /// @dev Distribute the PNKs at stake and the dispute fees for the specific round of the dispute, penalties only.
+    /// @param _params The parameters for the execution, see `ExecuteParams`.
+    /// @return pnkPenaltiesInRoundCache The updated penalties in round cache.
+    function _executePenalties(ExecuteParams memory _params) internal returns (uint256) {
+        Dispute storage dispute = disputes[_params.disputeID];
+        Round storage round = dispute.rounds[_params.round];
+        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
+
+        // [0, 1] value that determines how coherent the juror was in this round, in basis points.
+        uint256 coherence = disputeKit.getDegreeOfCoherencePenalty(
+            _params.disputeID,
+            _params.round,
+            _params.repartition,
+            _params.feePerJurorInRound,
+            _params.pnkAtStakePerJurorInRound
+        );
+
+        // Guard against degree exceeding 1, though it should be ensured by the dispute kit.
+        if (coherence > ONE_BASIS_POINT) {
+            coherence = ONE_BASIS_POINT;
+        }
+
+        // Fully coherent jurors won't be penalized.
+        uint256 penalty = (round.pnkAtStakePerJuror * (ONE_BASIS_POINT - coherence)) / ONE_BASIS_POINT;
+
+        // Unlock the PNKs affected by the penalty
+        address account = round.drawnJurors[_params.repartition];
+        sortitionModule.unlockStake(account, penalty);
+
+        // Apply the penalty to the staked PNKs.
+        uint96 penalizedInCourtID = round.drawnJurorFromCourtIDs[_params.repartition];
+        (uint256 pnkBalance, uint256 newCourtStake, uint256 availablePenalty) = sortitionModule.setStakePenalty(
+            account,
+            penalizedInCourtID,
+            penalty
+        );
+        _params.pnkPenaltiesInRound += availablePenalty;
+        emit TokenAndETHShift(
+            account,
+            _params.disputeID,
+            _params.round,
+            coherence,
+            -int256(availablePenalty),
+            0,
+            round.feeToken
+        );
+
+        if (pnkBalance == 0 || !disputeKit.isVoteActive(_params.disputeID, _params.round, _params.repartition)) {
+            // The juror is inactive or their balance is can't cover penalties anymore, unstake them from all courts.
+            sortitionModule.forcedUnstakeAllCourts(account);
+        } else if (newCourtStake < courts[penalizedInCourtID].minStake) {
+            // The juror's balance fell below the court minStake, unstake them from the court.
+            sortitionModule.forcedUnstake(account, penalizedInCourtID);
+        }
+
+        if (_params.repartition == _params.numberOfVotesInRound - 1 && _params.coherentCount == 0) {
+            // No one was coherent, send the rewards to the owner.
+            _transferFeeToken(round.feeToken, payable(owner), round.totalFeesForJurors);
+            pinakion.safeTransfer(owner, _params.pnkPenaltiesInRound);
+            emit LeftoverRewardSent(
+                _params.disputeID,
+                _params.round,
+                _params.pnkPenaltiesInRound,
+                round.totalFeesForJurors,
+                round.feeToken
+            );
+        }
+        return _params.pnkPenaltiesInRound;
+    }
+
+    /// @dev Distribute the PNKs at stake and the dispute fees for the specific round of the dispute, rewards only.
+    /// @param _params The parameters for the execution, see `ExecuteParams`.
+    function _executeRewards(ExecuteParams memory _params) internal {
+        Dispute storage dispute = disputes[_params.disputeID];
+        Round storage round = dispute.rounds[_params.round];
+        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
+
+        // [0, 1] value that determines how coherent the juror was in this round, in basis points.
+        (uint256 pnkCoherence, uint256 feeCoherence) = disputeKit.getDegreeOfCoherenceReward(
+            _params.disputeID,
+            _params.round,
+            _params.repartition % _params.numberOfVotesInRound,
+            _params.feePerJurorInRound,
+            _params.pnkAtStakePerJurorInRound
+        );
+
+        // Guard against degree exceeding 1, though it should be ensured by the dispute kit.
+        if (pnkCoherence > ONE_BASIS_POINT) {
+            pnkCoherence = ONE_BASIS_POINT;
+        }
+        if (feeCoherence > ONE_BASIS_POINT) {
+            feeCoherence = ONE_BASIS_POINT;
+        }
+
+        address account = round.drawnJurors[_params.repartition % _params.numberOfVotesInRound];
+        uint256 pnkLocked = _applyCoherence(round.pnkAtStakePerJuror, pnkCoherence);
+
+        // Release the rest of the PNKs of the juror for this round.
+        sortitionModule.unlockStake(account, pnkLocked);
+
+        // Compute the rewards
+        uint256 pnkReward = _applyCoherence(_params.pnkPenaltiesInRound / _params.coherentCount, pnkCoherence);
+        round.sumPnkRewardPaid += pnkReward;
+        uint256 feeReward = _applyCoherence(round.totalFeesForJurors / _params.coherentCount, feeCoherence);
+        round.sumFeeRewardPaid += feeReward;
+
+        // Transfer the fee reward
+        _transferFeeToken(round.feeToken, payable(account), feeReward);
+
+        // Stake the PNK reward if possible, by-passes delayed stakes and other checks usually done by validateStake()
+        if (!sortitionModule.setStakeReward(account, dispute.courtID, pnkReward)) {
+            pinakion.safeTransfer(account, pnkReward);
+        }
+
+        emit TokenAndETHShift(
+            account,
+            _params.disputeID,
+            _params.round,
+            pnkCoherence,
+            int256(pnkReward),
+            int256(feeReward),
+            round.feeToken
+        );
+
+        // Transfer any residual rewards to the owner. It may happen due to partial coherence of the jurors.
+        if (_params.repartition == _params.numberOfVotesInRound * 2 - 1) {
+            uint256 leftoverPnkReward = _params.pnkPenaltiesInRound - round.sumPnkRewardPaid;
+            uint256 leftoverFeeReward = round.totalFeesForJurors - round.sumFeeRewardPaid;
+            if (leftoverPnkReward != 0 || leftoverFeeReward != 0) {
+                if (leftoverPnkReward != 0) {
+                    pinakion.safeTransfer(owner, leftoverPnkReward);
+                }
+                if (leftoverFeeReward != 0) {
+                    _transferFeeToken(round.feeToken, payable(owner), leftoverFeeReward);
+                }
+                emit LeftoverRewardSent(
+                    _params.disputeID,
+                    _params.round,
+                    leftoverPnkReward,
+                    leftoverFeeReward,
+                    round.feeToken
+                );
+            }
+        }
+    }
+
+    /// @dev Executes a specified dispute's ruling.
+    /// @param _disputeID The ID of the dispute.
+    function executeRuling(uint256 _disputeID) external {
+        Dispute storage dispute = disputes[_disputeID];
+        if (dispute.period != Period.execution) revert NotExecutionPeriod();
+        if (dispute.ruled) revert RulingAlreadyExecuted();
+
+        (uint256 winningChoice, , ) = currentRuling(_disputeID);
+        dispute.ruled = true;
+        emit Ruling(dispute.arbitrated, _disputeID, winningChoice);
+        dispute.arbitrated.rule(_disputeID, winningChoice);
+    }
+
+    // ************************************* //
+    // *           Public Views            * //
+    // ************************************* //
+
+    /// @dev Compute the cost of arbitration denominated in ETH.
+    ///      It is recommended not to increase it often, as it can be highly time and gas consuming for the arbitrated contracts to cope with fee augmentation.
+    /// @param _extraData Additional info about the dispute. We use it to pass the ID of the dispute's court (first 32 bytes), the minimum number of jurors required (next 32 bytes) and the ID of the specific dispute kit (last 32 bytes).
+    /// @return cost The arbitration cost in ETH.
+    function arbitrationCost(bytes memory _extraData) public view override returns (uint256 cost) {
+        (uint96 courtID, uint256 minJurors, ) = _extraDataToCourtIDMinJurorsDisputeKit(_extraData);
+        cost = courts[courtID].feeForJuror * minJurors;
+    }
+
+    /// @dev Compute the cost of arbitration denominated in `_feeToken`.
+    ///      It is recommended not to increase it often, as it can be highly time and gas consuming for the arbitrated contracts to cope with fee augmentation.
+    /// @param _extraData Additional info about the dispute. We use it to pass the ID of the dispute's court (first 32 bytes), the minimum number of jurors required (next 32 bytes) and the ID of the specific dispute kit (last 32 bytes).
+    /// @param _feeToken The ERC20 token used to pay fees.
+    /// @return cost The arbitration cost in `_feeToken`.
+    function arbitrationCost(bytes calldata _extraData, IERC20 _feeToken) public view override returns (uint256 cost) {
+        cost = convertEthToTokenAmount(_feeToken, arbitrationCost(_extraData));
+    }
+
+    /// @dev Gets the cost of appealing a specified dispute.
+    /// @param _disputeID The ID of the dispute.
+    /// @return cost The appeal cost.
+    function appealCost(uint256 _disputeID) public view returns (uint256 cost) {
+        Dispute storage dispute = disputes[_disputeID];
+        Round storage round = dispute.rounds[dispute.rounds.length - 1];
+        Court storage court = courts[dispute.courtID];
+
+        (, uint256 newDisputeKitID, bool courtJump, ) = _getCourtAndDisputeKitJumps(dispute, round, court, _disputeID);
+
+        uint256 nbVotesAfterAppeal = disputeKits[newDisputeKitID].getNbVotesAfterAppeal(
+            disputeKits[round.disputeKitID],
+            round.nbVotes
+        );
+
+        if (courtJump) {
+            // Jump to parent court.
+            if (dispute.courtID == GENERAL_COURT) {
+                // TODO: Handle the forking when appealed in General court.
+                cost = NON_PAYABLE_AMOUNT; // Get the cost of the parent court.
+            } else {
+                cost = courts[court.parent].feeForJuror * nbVotesAfterAppeal;
+            }
+        } else {
+            // Stay in current court.
+            cost = court.feeForJuror * nbVotesAfterAppeal;
+        }
+    }
+
+    /// @dev Gets the start and the end of a specified dispute's current appeal period.
+    /// @param _disputeID The ID of the dispute.
+    /// @return start The start of the appeal period.
+    /// @return end The end of the appeal period.
+    function appealPeriod(uint256 _disputeID) external view returns (uint256 start, uint256 end) {
+        Dispute storage dispute = disputes[_disputeID];
+        if (dispute.period == Period.appeal) {
+            start = dispute.lastPeriodChange;
+            end = dispute.lastPeriodChange + courts[dispute.courtID].timesPerPeriod[uint256(Period.appeal)];
+        } else {
+            start = 0;
+            end = 0;
+        }
+    }
+
+    /// @dev Gets the current ruling of a specified dispute.
+    /// @param _disputeID The ID of the dispute.
+    /// @return ruling The current ruling.
+    /// @return tied Whether it's a tie or not.
+    /// @return overridden Whether the ruling was overridden by appeal funding or not.
+    function currentRuling(uint256 _disputeID) public view returns (uint256 ruling, bool tied, bool overridden) {
+        Dispute storage dispute = disputes[_disputeID];
+        Round storage round = dispute.rounds[dispute.rounds.length - 1];
+        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
+        (ruling, tied, overridden) = disputeKit.currentRuling(_disputeID);
+    }
+
+    /// @dev Gets the round info for a specified dispute and round.
+    /// @dev This function must not be called from a non-view function because it returns a dynamic array which might be very large, theoretically exceeding the block gas limit.
+    /// @param _disputeID The ID of the dispute.
+    /// @param _round The round to get the info for.
+    /// @return round The round info.
+    function getRoundInfo(uint256 _disputeID, uint256 _round) external view returns (Round memory) {
+        return disputes[_disputeID].rounds[_round];
+    }
+
+    /// @dev Gets the PNK at stake per juror for a specified dispute and round.
+    /// @param _disputeID The ID of the dispute.
+    /// @param _round The round to get the info for.
+    /// @return pnkAtStakePerJuror The PNK at stake per juror.
+    function getPnkAtStakePerJuror(uint256 _disputeID, uint256 _round) external view returns (uint256) {
+        return disputes[_disputeID].rounds[_round].pnkAtStakePerJuror;
+    }
+
+    /// @dev Gets the number of rounds for a specified dispute.
+    /// @param _disputeID The ID of the dispute.
+    /// @return The number of rounds.
+    function getNumberOfRounds(uint256 _disputeID) external view returns (uint256) {
+        return disputes[_disputeID].rounds.length;
+    }
+
+    /// @dev Checks if a given dispute kit is supported by a given court.
+    /// @param _courtID The ID of the court to check the support for.
+    /// @param _disputeKitID The ID of the dispute kit to check the support for.
+    /// @return Whether the dispute kit is supported or not.
+    function isSupported(uint96 _courtID, uint256 _disputeKitID) external view returns (bool) {
+        return courts[_courtID].supportedDisputeKits[_disputeKitID];
+    }
+
+    /// @dev Gets the timesPerPeriod array for a given court.
+    /// @param _courtID The ID of the court to get the times from.
+    /// @return timesPerPeriod The timesPerPeriod array for the given court.
+    function getTimesPerPeriod(uint96 _courtID) external view returns (uint256[4] memory timesPerPeriod) {
+        timesPerPeriod = courts[_courtID].timesPerPeriod;
+    }
+
+    // ************************************* //
+    // *   Public Views for Dispute Kits   * //
+    // ************************************* //
+
+    /// @dev Gets the number of votes permitted for the specified dispute in the latest round.
+    /// @param _disputeID The ID of the dispute.
+    function getNumberOfVotes(uint256 _disputeID) external view returns (uint256) {
+        Dispute storage dispute = disputes[_disputeID];
+        return dispute.rounds[dispute.rounds.length - 1].nbVotes;
+    }
+
+    /// @dev Returns true if the dispute kit will be switched to a parent DK.
+    /// @param _disputeID The ID of the dispute.
+    /// @return Whether DK will be switched or not.
+    function isDisputeKitJumping(uint256 _disputeID) external view returns (bool) {
+        Dispute storage dispute = disputes[_disputeID];
+        Round storage round = dispute.rounds[dispute.rounds.length - 1];
+        Court storage court = courts[dispute.courtID];
+
+        if (!_isCourtJumping(round, court, _disputeID)) {
+            return false;
+        }
+
+        // Jump if the parent court doesn't support the current DK.
+        return !courts[court.parent].supportedDisputeKits[round.disputeKitID];
+    }
+
+    function getDisputeKitsLength() external view returns (uint256) {
+        return disputeKits.length;
+    }
+
+    function convertEthToTokenAmount(IERC20 _toToken, uint256 _amountInEth) public view returns (uint256) {
+        return (_amountInEth * 10 ** currencyRates[_toToken].rateDecimals) / currencyRates[_toToken].rateInEth;
+    }
+
+    // ************************************* //
+    // *            Internal               * //
+    // ************************************* //
+
+    /// @dev Returns true if the round is jumping to a parent court.
+    /// @param _round The round to check.
+    /// @param _court The court to check.
+    /// @return Whether the round is jumping to a parent court or not.
+    function _isCourtJumping(
+        Round storage _round,
+        Court storage _court,
+        uint256 _disputeID
+    ) internal view returns (bool) {
+        return
+            disputeKits[_round.disputeKitID].earlyCourtJump(_disputeID) || _round.nbVotes >= _court.jurorsForCourtJump;
+    }
+
+    function _getCourtAndDisputeKitJumps(
+        Dispute storage _dispute,
+        Round storage _round,
+        Court storage _court,
+        uint256 _disputeID
+    ) internal view returns (uint96 newCourtID, uint256 newDisputeKitID, bool courtJump, bool disputeKitJump) {
+        newCourtID = _dispute.courtID;
+        newDisputeKitID = _round.disputeKitID;
+
+        if (!_isCourtJumping(_round, _court, _disputeID)) return (newCourtID, newDisputeKitID, false, false);
+
+        // Jump to parent court.
+        newCourtID = courts[newCourtID].parent;
+        courtJump = true;
+
+        if (!courts[newCourtID].supportedDisputeKits[newDisputeKitID]) {
+            // The current Dispute Kit is not compatible with the new court, jump to another Dispute Kit.
+            newDisputeKitID = disputeKits[_round.disputeKitID].getJumpDisputeKitID();
+            if (newDisputeKitID == NULL_DISPUTE_KIT || !courts[newCourtID].supportedDisputeKits[newDisputeKitID]) {
+                // The new Dispute Kit is not defined or still not compatible, fall back to `DisputeKitClassic` which is always supported.
+                newDisputeKitID = DISPUTE_KIT_CLASSIC;
+            }
+            disputeKitJump = true;
+        }
+    }
+
+    /// @dev Internal function to transfer fee tokens (ETH or ERC20)
+    /// @param _feeToken The token to transfer (NATIVE_CURRENCY for ETH).
+    /// @param _recipient The recipient address.
+    /// @param _amount The amount to transfer.
+    function _transferFeeToken(IERC20 _feeToken, address payable _recipient, uint256 _amount) internal {
+        if (_feeToken == NATIVE_CURRENCY) {
+            _recipient.safeSend(_amount, wNative);
+        } else {
+            _feeToken.safeTransfer(_recipient, _amount);
+        }
+    }
+
+    /// @dev Applies degree of coherence to an amount
+    /// @param _amount The base amount to apply coherence to.
+    /// @param _coherence The degree of coherence in basis points.
+    /// @return The amount after applying the degree of coherence.
+    function _applyCoherence(uint256 _amount, uint256 _coherence) internal pure returns (uint256) {
+        return (_amount * _coherence) / ONE_BASIS_POINT;
+    }
+
+    /// @dev Calculates PNK at stake per juror based on court parameters
+    /// @param _minStake The minimum stake for the court.
+    /// @param _alpha The alpha parameter for the court in basis points.
+    /// @return The amount of PNK at stake per juror.
+    function _calculatePnkAtStake(uint256 _minStake, uint256 _alpha) internal pure returns (uint256) {
+        return (_minStake * _alpha) / ONE_BASIS_POINT;
+    }
+
+    /// @dev Toggles the dispute kit support for a given court.
+    /// @param _courtID The ID of the court to toggle the support for.
+    /// @param _disputeKitID The ID of the dispute kit to toggle the support for.
+    /// @param _enable Whether to enable or disable the support. Note that classic dispute kit should always be enabled.
+    function _enableDisputeKit(uint96 _courtID, uint256 _disputeKitID, bool _enable) internal {
+        courts[_courtID].supportedDisputeKits[_disputeKitID] = _enable;
+        emit DisputeKitEnabled(_courtID, _disputeKitID, _enable);
+    }
+
+    /// @dev If called only once then set _onError to Revert, otherwise set it to Return
+    /// @param _account The account to set the stake for.
+    /// @param _courtID The ID of the court to set the stake for.
+    /// @param _newStake The new stake.
+    /// @param _noDelay True if the stake change should not be delayed.
+    /// @param _onError Whether to revert or return false on error.
+    /// @return Whether the stake was successfully set or not.
+    function _setStake(
+        address _account,
+        uint96 _courtID,
+        uint256 _newStake,
+        bool _noDelay,
+        OnError _onError
+    ) internal returns (bool) {
+        if (_courtID == FORKING_COURT || _courtID >= courts.length) {
+            _stakingFailed(_onError, StakingResult.CannotStakeInThisCourt); // Staking directly into the forking court is not allowed.
+            return false;
+        }
+        if (_newStake != 0 && _newStake < courts[_courtID].minStake) {
+            _stakingFailed(_onError, StakingResult.CannotStakeLessThanMinStake); // Staking less than the minimum stake is not allowed.
+            return false;
+        }
+        (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) = sortitionModule.validateStake(
+            _account,
+            _courtID,
+            _newStake,
+            _noDelay
+        );
+        if (stakingResult != StakingResult.Successful && stakingResult != StakingResult.Delayed) {
+            _stakingFailed(_onError, stakingResult);
+            return false;
+        } else if (stakingResult == StakingResult.Delayed) {
+            return true;
+        }
+        if (pnkDeposit > 0) {
+            if (!pinakion.safeTransferFrom(_account, address(this), pnkDeposit)) {
+                _stakingFailed(_onError, StakingResult.StakingTransferFailed);
+                return false;
+            }
+        }
+        if (pnkWithdrawal > 0) {
+            if (!pinakion.safeTransfer(_account, pnkWithdrawal)) {
+                _stakingFailed(_onError, StakingResult.UnstakingTransferFailed);
+                return false;
+            }
+        }
+        sortitionModule.setStake(_account, _courtID, pnkDeposit, pnkWithdrawal, _newStake);
+
+        return true;
+    }
+
+    /// @dev It may revert depending on the _onError parameter.
+    function _stakingFailed(OnError _onError, StakingResult _result) internal pure {
+        if (_onError == OnError.Return) return;
+        if (_result == StakingResult.StakingTransferFailed) revert StakingTransferFailed();
+        if (_result == StakingResult.UnstakingTransferFailed) revert UnstakingTransferFailed();
+        if (_result == StakingResult.CannotStakeInMoreCourts) revert StakingInTooManyCourts();
+        if (_result == StakingResult.CannotStakeInThisCourt) revert StakingNotPossibleInThisCourt();
+        if (_result == StakingResult.CannotStakeLessThanMinStake) revert StakingLessThanCourtMinStake();
+        if (_result == StakingResult.CannotStakeZeroWhenNoStake) revert StakingZeroWhenNoStake();
+        if (_result == StakingResult.CannotStakeMoreThanMaxStakePerJuror) revert StakingMoreThanMaxStakePerJuror();
+        if (_result == StakingResult.CannotStakeMoreThanMaxTotalStaked) revert StakingMoreThanMaxTotalStaked();
+    }
+
+    /// @dev Gets a court ID, the minimum number of jurors and an ID of a dispute kit from a specified extra data bytes array.
+    /// Note that if extradata contains an incorrect value then this value will be switched to default.
+    /// @param _extraData The extra data bytes array. The first 32 bytes are the court ID, the next are the minimum number of jurors and the last are the dispute kit ID.
+    /// @return courtID The court ID.
+    /// @return minJurors The minimum number of jurors required.
+    /// @return disputeKitID The ID of the dispute kit.
+    function _extraDataToCourtIDMinJurorsDisputeKit(
+        bytes memory _extraData
+    ) internal view returns (uint96 courtID, uint256 minJurors, uint256 disputeKitID) {
+        // Note that if the extradata doesn't contain 32 bytes for the dispute kit ID it'll return the default 0 index.
+        if (_extraData.length >= 64) {
+            assembly {
+                // solium-disable-line security/no-inline-assembly
+                courtID := mload(add(_extraData, 0x20))
+                minJurors := mload(add(_extraData, 0x40))
+                disputeKitID := mload(add(_extraData, 0x60))
+            }
+            if (courtID == FORKING_COURT || courtID >= courts.length) {
+                courtID = GENERAL_COURT;
+            }
+            if (minJurors == 0) {
+                minJurors = DEFAULT_NB_OF_JURORS;
+            }
+            if (disputeKitID == NULL_DISPUTE_KIT || disputeKitID >= disputeKits.length) {
+                disputeKitID = DISPUTE_KIT_CLASSIC; // 0 index is not used.
+            }
+        } else {
+            courtID = GENERAL_COURT;
+            minJurors = DEFAULT_NB_OF_JURORS;
+            disputeKitID = DISPUTE_KIT_CLASSIC;
+        }
+    }
+
+    // ************************************* //
+    // *              Errors               * //
+    // ************************************* //
+
+    error OwnerOnly();
+    error GuardianOrOwnerOnly();
+    error DisputeKitOnly();
+    error SortitionModuleOnly();
+    error UnsuccessfulCall();
+    error InvalidDisputKitParent();
+    error MinStakeLowerThanParentCourt();
+    error UnsupportedDisputeKit();
+    error InvalidForkingCourtAsParent();
+    error WrongDisputeKitIndex();
+    error CannotDisableClassicDK();
+    error NotEligibleForStaking();
+    error StakingMoreThanMaxStakePerJuror();
+    error StakingMoreThanMaxTotalStaked();
+    error StakingInTooManyCourts();
+    error StakingNotPossibleInThisCourt();
+    error StakingLessThanCourtMinStake();
+    error StakingTransferFailed();
+    error UnstakingTransferFailed();
+    error ArbitrableNotWhitelisted();
+    error ArbitrationFeesNotEnough();
+    error DisputeKitNotSupportedByCourt();
+    error MustSupportDisputeKitClassic();
+    error TokenNotAccepted();
+    error EvidenceNotPassedAndNotAppeal();
+    error DisputeStillDrawing();
+    error CommitPeriodNotPassed();
+    error VotePeriodNotPassed();
+    error AppealPeriodNotPassed();
+    error NotEvidencePeriod();
+    error AppealFeesNotEnough();
+    error DisputeNotAppealable();
+    error NotExecutionPeriod();
+    error RulingAlreadyExecuted();
+    error DisputePeriodIsFinal();
+    error TransferFailed();
+    error WhenNotPausedOnly();
+    error WhenPausedOnly();
+    error StakingZeroWhenNoStake();
 }
diff --git a/contracts/src/arbitration/KlerosCoreBase.sol b/contracts/src/arbitration/KlerosCoreBase.sol
deleted file mode 100644
index fc8095715..000000000
--- a/contracts/src/arbitration/KlerosCoreBase.sol
+++ /dev/null
@@ -1,1275 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.24;
-
-import {IArbitrableV2, IArbitratorV2} from "./interfaces/IArbitratorV2.sol";
-import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
-import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
-import {Initializable} from "../proxy/Initializable.sol";
-import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
-import {SafeERC20, IERC20} from "../libraries/SafeERC20.sol";
-import {SafeSend} from "../libraries/SafeSend.sol";
-import "../libraries/Constants.sol";
-
-/// @title KlerosCoreBase
-/// Core arbitrator contract for Kleros v2.
-/// Note that this contract trusts the PNK token, the dispute kit and the sortition module contracts.
-abstract contract KlerosCoreBase is IArbitratorV2, Initializable, UUPSProxiable {
-    using SafeERC20 for IERC20;
-    using SafeSend for address payable;
-
-    // ************************************* //
-    // *         Enums / Structs           * //
-    // ************************************* //
-
-    enum Period {
-        evidence, // Evidence can be submitted. This is also when drawing has to take place.
-        commit, // Jurors commit a hashed vote. This is skipped for courts without hidden votes.
-        vote, // Jurors reveal/cast their vote depending on whether the court has hidden votes or not.
-        appeal, // The dispute can be appealed.
-        execution // Tokens are redistributed and the ruling is executed.
-    }
-
-    struct Court {
-        uint96 parent; // The parent court.
-        bool hiddenVotes; // Whether to use commit and reveal or not.
-        uint256[] children; // List of child courts.
-        uint256 minStake; // Minimum PNKs needed to stake in the court.
-        uint256 alpha; // Basis point of PNKs that are lost when incoherent.
-        uint256 feeForJuror; // Arbitration fee paid per juror.
-        uint256 jurorsForCourtJump; // The appeal after the one that reaches this number of jurors will go to the parent court if any.
-        uint256[4] timesPerPeriod; // The time allotted to each dispute period in the form `timesPerPeriod[period]`.
-        mapping(uint256 disputeKitId => bool) supportedDisputeKits; // True if DK with this ID is supported by the court. Note that each court must support classic dispute kit.
-        bool disabled; // True if the court is disabled. Unused for now, will be implemented later.
-    }
-
-    struct Dispute {
-        uint96 courtID; // The ID of the court the dispute is in.
-        IArbitrableV2 arbitrated; // The arbitrable contract.
-        Period period; // The current period of the dispute.
-        bool ruled; // True if the ruling has been executed, false otherwise.
-        uint256 lastPeriodChange; // The last time the period was changed.
-        Round[] rounds;
-    }
-
-    struct Round {
-        uint256 disputeKitID; // Index of the dispute kit in the array.
-        uint256 pnkAtStakePerJuror; // The amount of PNKs at stake for each juror in this round.
-        uint256 totalFeesForJurors; // The total juror fees paid in this round.
-        uint256 nbVotes; // The total number of votes the dispute can possibly have in the current round. Former votes[_round].length.
-        uint256 repartitions; // A counter of reward repartitions made in this round.
-        uint256 pnkPenalties; // The amount of PNKs collected from penalties in this round.
-        address[] drawnJurors; // Addresses of the jurors that were drawn in this round.
-        uint96[] drawnJurorFromCourtIDs; // The courtIDs where the juror was drawn from, possibly their stake in a subcourt.
-        uint256 sumFeeRewardPaid; // Total sum of arbitration fees paid to coherent jurors as a reward in this round.
-        uint256 sumPnkRewardPaid; // Total sum of PNK paid to coherent jurors as a reward in this round.
-        IERC20 feeToken; // The token used for paying fees in this round.
-        uint256 drawIterations; // The number of iterations passed drawing the jurors for this round.
-    }
-
-    // Workaround "stack too deep" errors
-    struct ExecuteParams {
-        uint256 disputeID; // The ID of the dispute to execute.
-        uint256 round; // The round to execute.
-        uint256 coherentCount; // The number of coherent votes in the round.
-        uint256 numberOfVotesInRound; // The number of votes in the round.
-        uint256 feePerJurorInRound; // The fee per juror in the round.
-        uint256 pnkAtStakePerJurorInRound; // The amount of PNKs at stake for each juror in the round.
-        uint256 pnkPenaltiesInRound; // The amount of PNKs collected from penalties in the round.
-        uint256 repartition; // The index of the repartition to execute.
-    }
-
-    struct CurrencyRate {
-        bool feePaymentAccepted;
-        uint64 rateInEth;
-        uint8 rateDecimals;
-    }
-
-    // ************************************* //
-    // *             Storage               * //
-    // ************************************* //
-
-    uint256 private constant NON_PAYABLE_AMOUNT = (2 ** 256 - 2) / 2; // An amount higher than the supply of ETH.
-
-    address public owner; // The owner of the contract.
-    address public guardian; // The guardian able to pause asset withdrawals.
-    IERC20 public pinakion; // The Pinakion token contract.
-    address public jurorProsecutionModule; // The module for juror's prosecution.
-    ISortitionModule public sortitionModule; // Sortition module for drawing.
-    Court[] public courts; // The courts.
-    IDisputeKit[] public disputeKits; // Array of dispute kits.
-    Dispute[] public disputes; // The disputes.
-    mapping(IERC20 => CurrencyRate) public currencyRates; // The price of each token in ETH.
-    bool public paused; // Whether asset withdrawals are paused.
-    address public wNative; // The wrapped native token for safeSend().
-
-    // ************************************* //
-    // *              Events               * //
-    // ************************************* //
-
-    event NewPeriod(uint256 indexed _disputeID, Period _period);
-    event AppealPossible(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
-    event AppealDecision(uint256 indexed _disputeID, IArbitrableV2 indexed _arbitrable);
-    event Draw(address indexed _address, uint256 indexed _disputeID, uint256 _roundID, uint256 _voteID);
-    event CourtCreated(
-        uint96 indexed _courtID,
-        uint96 indexed _parent,
-        bool _hiddenVotes,
-        uint256 _minStake,
-        uint256 _alpha,
-        uint256 _feeForJuror,
-        uint256 _jurorsForCourtJump,
-        uint256[4] _timesPerPeriod,
-        uint256[] _supportedDisputeKits
-    );
-    event CourtModified(
-        uint96 indexed _courtID,
-        bool _hiddenVotes,
-        uint256 _minStake,
-        uint256 _alpha,
-        uint256 _feeForJuror,
-        uint256 _jurorsForCourtJump,
-        uint256[4] _timesPerPeriod
-    );
-    event DisputeKitCreated(uint256 indexed _disputeKitID, IDisputeKit indexed _disputeKitAddress);
-    event DisputeKitEnabled(uint96 indexed _courtID, uint256 indexed _disputeKitID, bool indexed _enable);
-    event CourtJump(
-        uint256 indexed _disputeID,
-        uint256 indexed _roundID,
-        uint96 indexed _fromCourtID,
-        uint96 _toCourtID
-    );
-    event DisputeKitJump(
-        uint256 indexed _disputeID,
-        uint256 indexed _roundID,
-        uint256 indexed _fromDisputeKitID,
-        uint256 _toDisputeKitID
-    );
-    event TokenAndETHShift(
-        address indexed _account,
-        uint256 indexed _disputeID,
-        uint256 indexed _roundID,
-        uint256 _degreeOfCoherency,
-        int256 _pnkAmount,
-        int256 _feeAmount,
-        IERC20 _feeToken
-    );
-    event LeftoverRewardSent(
-        uint256 indexed _disputeID,
-        uint256 indexed _roundID,
-        uint256 _pnkAmount,
-        uint256 _feeAmount,
-        IERC20 _feeToken
-    );
-    event Paused();
-    event Unpaused();
-
-    // ************************************* //
-    // *        Function Modifiers         * //
-    // ************************************* //
-
-    modifier onlyByOwner() {
-        if (owner != msg.sender) revert OwnerOnly();
-        _;
-    }
-
-    modifier onlyByGuardianOrOwner() {
-        if (guardian != msg.sender && owner != msg.sender) revert GuardianOrOwnerOnly();
-        _;
-    }
-
-    modifier whenPaused() {
-        if (!paused) revert WhenPausedOnly();
-        _;
-    }
-
-    modifier whenNotPaused() {
-        if (paused) revert WhenNotPausedOnly();
-        _;
-    }
-
-    // ************************************* //
-    // *            Constructor            * //
-    // ************************************* //
-
-    function __KlerosCoreBase_initialize(
-        address _owner,
-        address _guardian,
-        IERC20 _pinakion,
-        address _jurorProsecutionModule,
-        IDisputeKit _disputeKit,
-        bool _hiddenVotes,
-        uint256[4] memory _courtParameters,
-        uint256[4] memory _timesPerPeriod,
-        bytes memory _sortitionExtraData,
-        ISortitionModule _sortitionModuleAddress,
-        address _wNative
-    ) internal onlyInitializing {
-        owner = _owner;
-        guardian = _guardian;
-        pinakion = _pinakion;
-        jurorProsecutionModule = _jurorProsecutionModule;
-        sortitionModule = _sortitionModuleAddress;
-        wNative = _wNative;
-
-        // NULL_DISPUTE_KIT: an empty element at index 0 to indicate when a dispute kit is not supported.
-        disputeKits.push();
-
-        // DISPUTE_KIT_CLASSIC
-        disputeKits.push(_disputeKit);
-
-        emit DisputeKitCreated(DISPUTE_KIT_CLASSIC, _disputeKit);
-
-        // FORKING_COURT
-        // TODO: Fill the properties for the Forking court, emit CourtCreated.
-        courts.push();
-        sortitionModule.createTree(FORKING_COURT, _sortitionExtraData);
-
-        // GENERAL_COURT
-        Court storage court = courts.push();
-        court.parent = FORKING_COURT;
-        court.children = new uint256[](0);
-        court.hiddenVotes = _hiddenVotes;
-        court.minStake = _courtParameters[0];
-        court.alpha = _courtParameters[1];
-        court.feeForJuror = _courtParameters[2];
-        court.jurorsForCourtJump = _courtParameters[3];
-        court.timesPerPeriod = _timesPerPeriod;
-
-        sortitionModule.createTree(GENERAL_COURT, _sortitionExtraData);
-
-        uint256[] memory supportedDisputeKits = new uint256[](1);
-        supportedDisputeKits[0] = DISPUTE_KIT_CLASSIC;
-        emit CourtCreated(
-            GENERAL_COURT,
-            court.parent,
-            _hiddenVotes,
-            _courtParameters[0],
-            _courtParameters[1],
-            _courtParameters[2],
-            _courtParameters[3],
-            _timesPerPeriod,
-            supportedDisputeKits
-        );
-        _enableDisputeKit(GENERAL_COURT, DISPUTE_KIT_CLASSIC, true);
-    }
-
-    // ************************************* //
-    // *             Governance            * //
-    // ************************************* //
-
-    /// @dev Pause staking and reward execution. Can only be done by guardian or owner.
-    function pause() external onlyByGuardianOrOwner whenNotPaused {
-        paused = true;
-        emit Paused();
-    }
-
-    /// @dev Unpause staking and reward execution. Can only be done by owner.
-    function unpause() external onlyByOwner whenPaused {
-        paused = false;
-        emit Unpaused();
-    }
-
-    /// @dev Allows the owner to call anything on behalf of the contract.
-    /// @param _destination The destination of the call.
-    /// @param _amount The value sent with the call.
-    /// @param _data The data sent with the call.
-    function executeOwnerProposal(address _destination, uint256 _amount, bytes memory _data) external onlyByOwner {
-        (bool success, ) = _destination.call{value: _amount}(_data);
-        if (!success) revert UnsuccessfulCall();
-    }
-
-    /// @dev Changes the `owner` storage variable.
-    /// @param _owner The new value for the `owner` storage variable.
-    function changeOwner(address payable _owner) external onlyByOwner {
-        owner = _owner;
-    }
-
-    /// @dev Changes the `guardian` storage variable.
-    /// @param _guardian The new value for the `guardian` storage variable.
-    function changeGuardian(address _guardian) external onlyByOwner {
-        guardian = _guardian;
-    }
-
-    /// @dev Changes the `pinakion` storage variable.
-    /// @param _pinakion The new value for the `pinakion` storage variable.
-    function changePinakion(IERC20 _pinakion) external onlyByOwner {
-        pinakion = _pinakion;
-    }
-
-    /// @dev Changes the `jurorProsecutionModule` storage variable.
-    /// @param _jurorProsecutionModule The new value for the `jurorProsecutionModule` storage variable.
-    function changeJurorProsecutionModule(address _jurorProsecutionModule) external onlyByOwner {
-        jurorProsecutionModule = _jurorProsecutionModule;
-    }
-
-    /// @dev Changes the `_sortitionModule` storage variable.
-    /// Note that the new module should be initialized for all courts.
-    /// @param _sortitionModule The new value for the `sortitionModule` storage variable.
-    function changeSortitionModule(ISortitionModule _sortitionModule) external onlyByOwner {
-        sortitionModule = _sortitionModule;
-    }
-
-    /// @dev Add a new supported dispute kit module to the court.
-    /// @param _disputeKitAddress The address of the dispute kit contract.
-    function addNewDisputeKit(IDisputeKit _disputeKitAddress) external onlyByOwner {
-        uint256 disputeKitID = disputeKits.length;
-        disputeKits.push(_disputeKitAddress);
-        emit DisputeKitCreated(disputeKitID, _disputeKitAddress);
-    }
-
-    /// @dev Creates a court under a specified parent court.
-    /// @param _parent The `parent` property value of the court.
-    /// @param _hiddenVotes The `hiddenVotes` property value of the court.
-    /// @param _minStake The `minStake` property value of the court.
-    /// @param _alpha The `alpha` property value of the court.
-    /// @param _feeForJuror The `feeForJuror` property value of the court.
-    /// @param _jurorsForCourtJump The `jurorsForCourtJump` property value of the court.
-    /// @param _timesPerPeriod The `timesPerPeriod` property value of the court.
-    /// @param _sortitionExtraData Extra data for sortition module.
-    /// @param _supportedDisputeKits Indexes of dispute kits that this court will support.
-    function createCourt(
-        uint96 _parent,
-        bool _hiddenVotes,
-        uint256 _minStake,
-        uint256 _alpha,
-        uint256 _feeForJuror,
-        uint256 _jurorsForCourtJump,
-        uint256[4] memory _timesPerPeriod,
-        bytes memory _sortitionExtraData,
-        uint256[] memory _supportedDisputeKits
-    ) external onlyByOwner {
-        if (courts[_parent].minStake > _minStake) revert MinStakeLowerThanParentCourt();
-        if (_supportedDisputeKits.length == 0) revert UnsupportedDisputeKit();
-        if (_parent == FORKING_COURT) revert InvalidForkingCourtAsParent();
-
-        uint96 courtID = uint96(courts.length);
-        Court storage court = courts.push();
-
-        for (uint256 i = 0; i < _supportedDisputeKits.length; i++) {
-            if (_supportedDisputeKits[i] == 0 || _supportedDisputeKits[i] >= disputeKits.length) {
-                revert WrongDisputeKitIndex();
-            }
-            _enableDisputeKit(uint96(courtID), _supportedDisputeKits[i], true);
-        }
-        // Check that Classic DK support was added.
-        if (!court.supportedDisputeKits[DISPUTE_KIT_CLASSIC]) revert MustSupportDisputeKitClassic();
-
-        court.parent = _parent;
-        court.children = new uint256[](0);
-        court.hiddenVotes = _hiddenVotes;
-        court.minStake = _minStake;
-        court.alpha = _alpha;
-        court.feeForJuror = _feeForJuror;
-        court.jurorsForCourtJump = _jurorsForCourtJump;
-        court.timesPerPeriod = _timesPerPeriod;
-
-        sortitionModule.createTree(courtID, _sortitionExtraData);
-
-        // Update the parent.
-        courts[_parent].children.push(courtID);
-        emit CourtCreated(
-            uint96(courtID),
-            _parent,
-            _hiddenVotes,
-            _minStake,
-            _alpha,
-            _feeForJuror,
-            _jurorsForCourtJump,
-            _timesPerPeriod,
-            _supportedDisputeKits
-        );
-    }
-
-    function changeCourtParameters(
-        uint96 _courtID,
-        bool _hiddenVotes,
-        uint256 _minStake,
-        uint256 _alpha,
-        uint256 _feeForJuror,
-        uint256 _jurorsForCourtJump,
-        uint256[4] memory _timesPerPeriod
-    ) external onlyByOwner {
-        Court storage court = courts[_courtID];
-        if (_courtID != GENERAL_COURT && courts[court.parent].minStake > _minStake) {
-            revert MinStakeLowerThanParentCourt();
-        }
-        for (uint256 i = 0; i < court.children.length; i++) {
-            if (courts[court.children[i]].minStake < _minStake) {
-                revert MinStakeLowerThanParentCourt();
-            }
-        }
-        court.minStake = _minStake;
-        court.hiddenVotes = _hiddenVotes;
-        court.alpha = _alpha;
-        court.feeForJuror = _feeForJuror;
-        court.jurorsForCourtJump = _jurorsForCourtJump;
-        court.timesPerPeriod = _timesPerPeriod;
-        emit CourtModified(
-            _courtID,
-            _hiddenVotes,
-            _minStake,
-            _alpha,
-            _feeForJuror,
-            _jurorsForCourtJump,
-            _timesPerPeriod
-        );
-    }
-
-    /// @dev Adds/removes court's support for specified dispute kits.
-    /// @param _courtID The ID of the court.
-    /// @param _disputeKitIDs The IDs of dispute kits which support should be added/removed.
-    /// @param _enable Whether add or remove the dispute kits from the court.
-    function enableDisputeKits(uint96 _courtID, uint256[] memory _disputeKitIDs, bool _enable) external onlyByOwner {
-        for (uint256 i = 0; i < _disputeKitIDs.length; i++) {
-            if (_enable) {
-                if (_disputeKitIDs[i] == 0 || _disputeKitIDs[i] >= disputeKits.length) {
-                    revert WrongDisputeKitIndex();
-                }
-                _enableDisputeKit(_courtID, _disputeKitIDs[i], true);
-            } else {
-                // Classic dispute kit must be supported by all courts.
-                if (_disputeKitIDs[i] == DISPUTE_KIT_CLASSIC) {
-                    revert CannotDisableClassicDK();
-                }
-                _enableDisputeKit(_courtID, _disputeKitIDs[i], false);
-            }
-        }
-    }
-
-    /// @dev Changes the supported fee tokens.
-    /// @param _feeToken The fee token.
-    /// @param _accepted Whether the token is supported or not as a method of fee payment.
-    function changeAcceptedFeeTokens(IERC20 _feeToken, bool _accepted) external onlyByOwner {
-        currencyRates[_feeToken].feePaymentAccepted = _accepted;
-        emit AcceptedFeeToken(_feeToken, _accepted);
-    }
-
-    /// @dev Changes the currency rate of a fee token.
-    /// @param _feeToken The fee token.
-    /// @param _rateInEth The new rate of the fee token in ETH.
-    /// @param _rateDecimals The new decimals of the fee token rate.
-    function changeCurrencyRates(IERC20 _feeToken, uint64 _rateInEth, uint8 _rateDecimals) external onlyByOwner {
-        currencyRates[_feeToken].rateInEth = _rateInEth;
-        currencyRates[_feeToken].rateDecimals = _rateDecimals;
-        emit NewCurrencyRate(_feeToken, _rateInEth, _rateDecimals);
-    }
-
-    // ************************************* //
-    // *         State Modifiers           * //
-    // ************************************* //
-
-    /// @dev Sets the caller's stake in a court.
-    /// @param _courtID The ID of the court.
-    /// @param _newStake The new stake.
-    /// Note that the existing delayed stake will be nullified as non-relevant.
-    function setStake(uint96 _courtID, uint256 _newStake) external virtual whenNotPaused {
-        _setStake(msg.sender, _courtID, _newStake, false, OnError.Revert);
-    }
-
-    /// @dev Sets the stake of a specified account in a court without delaying stake changes, typically to apply a delayed stake or unstake inactive jurors.
-    /// @param _account The account whose stake is being set.
-    /// @param _courtID The ID of the court.
-    /// @param _newStake The new stake.
-    function setStakeBySortitionModule(address _account, uint96 _courtID, uint256 _newStake) external {
-        if (msg.sender != address(sortitionModule)) revert SortitionModuleOnly();
-        _setStake(_account, _courtID, _newStake, true, OnError.Return);
-    }
-
-    /// @dev Transfers PNK to the juror by SortitionModule.
-    /// @param _account The account of the juror whose PNK to transfer.
-    /// @param _amount The amount to transfer.
-    function transferBySortitionModule(address _account, uint256 _amount) external {
-        if (msg.sender != address(sortitionModule)) revert SortitionModuleOnly();
-        // Note eligibility is checked in SortitionModule.
-        pinakion.safeTransfer(_account, _amount);
-    }
-
-    /// @inheritdoc IArbitratorV2
-    function createDispute(
-        uint256 _numberOfChoices,
-        bytes memory _extraData
-    ) external payable override returns (uint256 disputeID) {
-        if (msg.value < arbitrationCost(_extraData)) revert ArbitrationFeesNotEnough();
-
-        return _createDispute(_numberOfChoices, _extraData, NATIVE_CURRENCY, msg.value);
-    }
-
-    /// @inheritdoc IArbitratorV2
-    function createDispute(
-        uint256 _numberOfChoices,
-        bytes calldata _extraData,
-        IERC20 _feeToken,
-        uint256 _feeAmount
-    ) external override returns (uint256 disputeID) {
-        if (!currencyRates[_feeToken].feePaymentAccepted) revert TokenNotAccepted();
-        if (_feeAmount < arbitrationCost(_extraData, _feeToken)) revert ArbitrationFeesNotEnough();
-
-        if (!_feeToken.safeTransferFrom(msg.sender, address(this), _feeAmount)) revert TransferFailed();
-        return _createDispute(_numberOfChoices, _extraData, _feeToken, _feeAmount);
-    }
-
-    function _createDispute(
-        uint256 _numberOfChoices,
-        bytes memory _extraData,
-        IERC20 _feeToken,
-        uint256 _feeAmount
-    ) internal virtual returns (uint256 disputeID) {
-        (uint96 courtID, , uint256 disputeKitID) = _extraDataToCourtIDMinJurorsDisputeKit(_extraData);
-        if (!courts[courtID].supportedDisputeKits[disputeKitID]) revert DisputeKitNotSupportedByCourt();
-
-        disputeID = disputes.length;
-        Dispute storage dispute = disputes.push();
-        dispute.courtID = courtID;
-        dispute.arbitrated = IArbitrableV2(msg.sender);
-        dispute.lastPeriodChange = block.timestamp;
-
-        IDisputeKit disputeKit = disputeKits[disputeKitID];
-        Court storage court = courts[courtID];
-        Round storage round = dispute.rounds.push();
-
-        // Obtain the feeForJuror in the same currency as the _feeAmount
-        uint256 feeForJuror = (_feeToken == NATIVE_CURRENCY)
-            ? court.feeForJuror
-            : convertEthToTokenAmount(_feeToken, court.feeForJuror);
-        round.nbVotes = _feeAmount / feeForJuror;
-        round.disputeKitID = disputeKitID;
-        round.pnkAtStakePerJuror = _calculatePnkAtStake(court.minStake, court.alpha);
-        round.totalFeesForJurors = _feeAmount;
-        round.feeToken = IERC20(_feeToken);
-
-        sortitionModule.createDisputeHook(disputeID, 0); // Default round ID.
-
-        disputeKit.createDispute(disputeID, _numberOfChoices, _extraData, round.nbVotes);
-        emit DisputeCreation(disputeID, IArbitrableV2(msg.sender));
-    }
-
-    /// @dev Passes the period of a specified dispute.
-    /// @param _disputeID The ID of the dispute.
-    function passPeriod(uint256 _disputeID) external {
-        Dispute storage dispute = disputes[_disputeID];
-        Court storage court = courts[dispute.courtID];
-
-        uint256 currentRound = dispute.rounds.length - 1;
-        Round storage round = dispute.rounds[currentRound];
-        if (dispute.period == Period.evidence) {
-            if (
-                currentRound == 0 &&
-                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)]
-            ) {
-                revert EvidenceNotPassedAndNotAppeal();
-            }
-            if (round.drawnJurors.length != round.nbVotes) revert DisputeStillDrawing();
-            dispute.period = court.hiddenVotes ? Period.commit : Period.vote;
-        } else if (dispute.period == Period.commit) {
-            // Note that we do not want to pass to Voting period if all the commits are cast because it breaks the Shutter auto-reveal currently.
-            if (block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)]) {
-                revert CommitPeriodNotPassed();
-            }
-            dispute.period = Period.vote;
-        } else if (dispute.period == Period.vote) {
-            if (
-                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)] &&
-                !disputeKits[round.disputeKitID].areVotesAllCast(_disputeID)
-            ) {
-                revert VotePeriodNotPassed();
-            }
-            dispute.period = Period.appeal;
-            emit AppealPossible(_disputeID, dispute.arbitrated);
-        } else if (dispute.period == Period.appeal) {
-            if (
-                block.timestamp - dispute.lastPeriodChange < court.timesPerPeriod[uint256(dispute.period)] &&
-                !disputeKits[round.disputeKitID].isAppealFunded(_disputeID)
-            ) {
-                revert AppealPeriodNotPassed();
-            }
-            dispute.period = Period.execution;
-        } else if (dispute.period == Period.execution) {
-            revert DisputePeriodIsFinal();
-        }
-
-        dispute.lastPeriodChange = block.timestamp;
-        emit NewPeriod(_disputeID, dispute.period);
-    }
-
-    /// @dev Draws jurors for the dispute. Can be called in parts.
-    /// @param _disputeID The ID of the dispute.
-    /// @param _iterations The number of iterations to run.
-    /// @return nbDrawnJurors The total number of jurors drawn in the round.
-    function draw(uint256 _disputeID, uint256 _iterations) external returns (uint256 nbDrawnJurors) {
-        Dispute storage dispute = disputes[_disputeID];
-        uint256 currentRound = dispute.rounds.length - 1;
-        Round storage round = dispute.rounds[currentRound];
-        if (dispute.period != Period.evidence) revert NotEvidencePeriod();
-
-        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
-
-        uint256 startIndex = round.drawIterations; // for gas: less storage reads
-        uint256 i;
-        while (i < _iterations && round.drawnJurors.length < round.nbVotes) {
-            (address drawnAddress, uint96 fromSubcourtID) = disputeKit.draw(_disputeID, startIndex + i++);
-            if (drawnAddress == address(0)) {
-                continue;
-            }
-            sortitionModule.lockStake(drawnAddress, round.pnkAtStakePerJuror);
-            emit Draw(drawnAddress, _disputeID, currentRound, round.drawnJurors.length);
-            round.drawnJurors.push(drawnAddress);
-            round.drawnJurorFromCourtIDs.push(fromSubcourtID != 0 ? fromSubcourtID : dispute.courtID);
-            if (round.drawnJurors.length == round.nbVotes) {
-                sortitionModule.postDrawHook(_disputeID, currentRound);
-            }
-        }
-        round.drawIterations += i;
-        return round.drawnJurors.length;
-    }
-
-    /// @dev Appeals the ruling of a specified dispute.
-    /// Note: Access restricted to the Dispute Kit for this `disputeID`.
-    /// @param _disputeID The ID of the dispute.
-    /// @param _numberOfChoices Number of choices for the dispute. Can be required during court jump.
-    /// @param _extraData Extradata for the dispute. Can be required during court jump.
-    function appeal(uint256 _disputeID, uint256 _numberOfChoices, bytes memory _extraData) external payable {
-        if (msg.value < appealCost(_disputeID)) revert AppealFeesNotEnough();
-
-        Dispute storage dispute = disputes[_disputeID];
-        if (dispute.period != Period.appeal) revert DisputeNotAppealable();
-
-        Round storage round = dispute.rounds[dispute.rounds.length - 1];
-        if (msg.sender != address(disputeKits[round.disputeKitID])) revert DisputeKitOnly();
-
-        // Warning: the extra round must be created before calling disputeKit.createDispute()
-        Round storage extraRound = dispute.rounds.push();
-
-        (uint96 newCourtID, uint256 newDisputeKitID, bool courtJump, ) = _getCourtAndDisputeKitJumps(
-            dispute,
-            round,
-            courts[dispute.courtID],
-            _disputeID
-        );
-        if (courtJump) {
-            emit CourtJump(_disputeID, dispute.rounds.length - 1, dispute.courtID, newCourtID);
-        }
-
-        dispute.courtID = newCourtID;
-        dispute.period = Period.evidence;
-        dispute.lastPeriodChange = block.timestamp;
-
-        Court storage court = courts[newCourtID];
-        extraRound.nbVotes = msg.value / court.feeForJuror; // As many votes that can be afforded by the provided funds.
-        extraRound.pnkAtStakePerJuror = _calculatePnkAtStake(court.minStake, court.alpha);
-        extraRound.totalFeesForJurors = msg.value;
-        extraRound.disputeKitID = newDisputeKitID;
-
-        sortitionModule.createDisputeHook(_disputeID, dispute.rounds.length - 1);
-
-        // Dispute kit was changed, so create a dispute in the new DK contract.
-        if (extraRound.disputeKitID != round.disputeKitID) {
-            emit DisputeKitJump(_disputeID, dispute.rounds.length - 1, round.disputeKitID, extraRound.disputeKitID);
-            disputeKits[extraRound.disputeKitID].createDispute(
-                _disputeID,
-                _numberOfChoices,
-                _extraData,
-                extraRound.nbVotes
-            );
-        }
-
-        emit AppealDecision(_disputeID, dispute.arbitrated);
-        emit NewPeriod(_disputeID, Period.evidence);
-    }
-
-    /// @dev Distribute the PNKs at stake and the dispute fees for the specific round of the dispute. Can be called in parts.
-    /// Note: Reward distributions are forbidden during pause.
-    /// @param _disputeID The ID of the dispute.
-    /// @param _round The appeal round.
-    /// @param _iterations The number of iterations to run.
-    function execute(uint256 _disputeID, uint256 _round, uint256 _iterations) external whenNotPaused {
-        Round storage round;
-        {
-            Dispute storage dispute = disputes[_disputeID];
-            if (dispute.period != Period.execution) revert NotExecutionPeriod();
-
-            round = dispute.rounds[_round];
-        } // stack too deep workaround
-
-        uint256 start = round.repartitions;
-        uint256 end = round.repartitions + _iterations;
-
-        uint256 pnkPenaltiesInRound = round.pnkPenalties; // Keep in memory to save gas.
-        uint256 numberOfVotesInRound = round.drawnJurors.length;
-        uint256 feePerJurorInRound = round.totalFeesForJurors / numberOfVotesInRound;
-        uint256 pnkAtStakePerJurorInRound = round.pnkAtStakePerJuror;
-        uint256 coherentCount;
-        {
-            IDisputeKit disputeKit = disputeKits[round.disputeKitID];
-            coherentCount = disputeKit.getCoherentCount(_disputeID, _round); // Total number of jurors that are eligible to a reward in this round.
-        } // stack too deep workaround
-
-        if (coherentCount == 0) {
-            // We loop over the votes once as there are no rewards because it is not a tie and no one in this round is coherent with the final outcome.
-            if (end > numberOfVotesInRound) end = numberOfVotesInRound;
-        } else {
-            // We loop over the votes twice, first to collect the PNK penalties, and second to distribute them as rewards along with arbitration fees.
-            if (end > numberOfVotesInRound * 2) end = numberOfVotesInRound * 2;
-        }
-        round.repartitions = end;
-
-        for (uint256 i = start; i < end; i++) {
-            if (i < numberOfVotesInRound) {
-                pnkPenaltiesInRound = _executePenalties(
-                    ExecuteParams({
-                        disputeID: _disputeID,
-                        round: _round,
-                        coherentCount: coherentCount,
-                        numberOfVotesInRound: numberOfVotesInRound,
-                        feePerJurorInRound: feePerJurorInRound,
-                        pnkAtStakePerJurorInRound: pnkAtStakePerJurorInRound,
-                        pnkPenaltiesInRound: pnkPenaltiesInRound,
-                        repartition: i
-                    })
-                );
-            } else {
-                _executeRewards(
-                    ExecuteParams({
-                        disputeID: _disputeID,
-                        round: _round,
-                        coherentCount: coherentCount,
-                        numberOfVotesInRound: numberOfVotesInRound,
-                        feePerJurorInRound: feePerJurorInRound,
-                        pnkAtStakePerJurorInRound: pnkAtStakePerJurorInRound,
-                        pnkPenaltiesInRound: pnkPenaltiesInRound,
-                        repartition: i
-                    })
-                );
-            }
-        }
-        if (round.pnkPenalties != pnkPenaltiesInRound) {
-            round.pnkPenalties = pnkPenaltiesInRound; // Reentrancy risk: breaks Check-Effect-Interact
-        }
-    }
-
-    /// @dev Distribute the PNKs at stake and the dispute fees for the specific round of the dispute, penalties only.
-    /// @param _params The parameters for the execution, see `ExecuteParams`.
-    /// @return pnkPenaltiesInRoundCache The updated penalties in round cache.
-    function _executePenalties(ExecuteParams memory _params) internal returns (uint256) {
-        Dispute storage dispute = disputes[_params.disputeID];
-        Round storage round = dispute.rounds[_params.round];
-        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
-
-        // [0, 1] value that determines how coherent the juror was in this round, in basis points.
-        uint256 coherence = disputeKit.getDegreeOfCoherencePenalty(
-            _params.disputeID,
-            _params.round,
-            _params.repartition,
-            _params.feePerJurorInRound,
-            _params.pnkAtStakePerJurorInRound
-        );
-
-        // Guard against degree exceeding 1, though it should be ensured by the dispute kit.
-        if (coherence > ONE_BASIS_POINT) {
-            coherence = ONE_BASIS_POINT;
-        }
-
-        // Fully coherent jurors won't be penalized.
-        uint256 penalty = (round.pnkAtStakePerJuror * (ONE_BASIS_POINT - coherence)) / ONE_BASIS_POINT;
-
-        // Unlock the PNKs affected by the penalty
-        address account = round.drawnJurors[_params.repartition];
-        sortitionModule.unlockStake(account, penalty);
-
-        // Apply the penalty to the staked PNKs.
-        uint96 penalizedInCourtID = round.drawnJurorFromCourtIDs[_params.repartition];
-        (uint256 pnkBalance, uint256 newCourtStake, uint256 availablePenalty) = sortitionModule.setStakePenalty(
-            account,
-            penalizedInCourtID,
-            penalty
-        );
-        _params.pnkPenaltiesInRound += availablePenalty;
-        emit TokenAndETHShift(
-            account,
-            _params.disputeID,
-            _params.round,
-            coherence,
-            -int256(availablePenalty),
-            0,
-            round.feeToken
-        );
-
-        if (pnkBalance == 0 || !disputeKit.isVoteActive(_params.disputeID, _params.round, _params.repartition)) {
-            // The juror is inactive or their balance is can't cover penalties anymore, unstake them from all courts.
-            sortitionModule.forcedUnstakeAllCourts(account);
-        } else if (newCourtStake < courts[penalizedInCourtID].minStake) {
-            // The juror's balance fell below the court minStake, unstake them from the court.
-            sortitionModule.forcedUnstake(account, penalizedInCourtID);
-        }
-
-        if (_params.repartition == _params.numberOfVotesInRound - 1 && _params.coherentCount == 0) {
-            // No one was coherent, send the rewards to the owner.
-            _transferFeeToken(round.feeToken, payable(owner), round.totalFeesForJurors);
-            pinakion.safeTransfer(owner, _params.pnkPenaltiesInRound);
-            emit LeftoverRewardSent(
-                _params.disputeID,
-                _params.round,
-                _params.pnkPenaltiesInRound,
-                round.totalFeesForJurors,
-                round.feeToken
-            );
-        }
-        return _params.pnkPenaltiesInRound;
-    }
-
-    /// @dev Distribute the PNKs at stake and the dispute fees for the specific round of the dispute, rewards only.
-    /// @param _params The parameters for the execution, see `ExecuteParams`.
-    function _executeRewards(ExecuteParams memory _params) internal {
-        Dispute storage dispute = disputes[_params.disputeID];
-        Round storage round = dispute.rounds[_params.round];
-        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
-
-        // [0, 1] value that determines how coherent the juror was in this round, in basis points.
-        (uint256 pnkCoherence, uint256 feeCoherence) = disputeKit.getDegreeOfCoherenceReward(
-            _params.disputeID,
-            _params.round,
-            _params.repartition % _params.numberOfVotesInRound,
-            _params.feePerJurorInRound,
-            _params.pnkAtStakePerJurorInRound
-        );
-
-        // Guard against degree exceeding 1, though it should be ensured by the dispute kit.
-        if (pnkCoherence > ONE_BASIS_POINT) {
-            pnkCoherence = ONE_BASIS_POINT;
-        }
-        if (feeCoherence > ONE_BASIS_POINT) {
-            feeCoherence = ONE_BASIS_POINT;
-        }
-
-        address account = round.drawnJurors[_params.repartition % _params.numberOfVotesInRound];
-        uint256 pnkLocked = _applyCoherence(round.pnkAtStakePerJuror, pnkCoherence);
-
-        // Release the rest of the PNKs of the juror for this round.
-        sortitionModule.unlockStake(account, pnkLocked);
-
-        // Compute the rewards
-        uint256 pnkReward = _applyCoherence(_params.pnkPenaltiesInRound / _params.coherentCount, pnkCoherence);
-        round.sumPnkRewardPaid += pnkReward;
-        uint256 feeReward = _applyCoherence(round.totalFeesForJurors / _params.coherentCount, feeCoherence);
-        round.sumFeeRewardPaid += feeReward;
-
-        // Transfer the fee reward
-        _transferFeeToken(round.feeToken, payable(account), feeReward);
-
-        // Stake the PNK reward if possible, by-passes delayed stakes and other checks usually done by validateStake()
-        if (!sortitionModule.setStakeReward(account, dispute.courtID, pnkReward)) {
-            pinakion.safeTransfer(account, pnkReward);
-        }
-
-        emit TokenAndETHShift(
-            account,
-            _params.disputeID,
-            _params.round,
-            pnkCoherence,
-            int256(pnkReward),
-            int256(feeReward),
-            round.feeToken
-        );
-
-        // Transfer any residual rewards to the owner. It may happen due to partial coherence of the jurors.
-        if (_params.repartition == _params.numberOfVotesInRound * 2 - 1) {
-            uint256 leftoverPnkReward = _params.pnkPenaltiesInRound - round.sumPnkRewardPaid;
-            uint256 leftoverFeeReward = round.totalFeesForJurors - round.sumFeeRewardPaid;
-            if (leftoverPnkReward != 0 || leftoverFeeReward != 0) {
-                if (leftoverPnkReward != 0) {
-                    pinakion.safeTransfer(owner, leftoverPnkReward);
-                }
-                if (leftoverFeeReward != 0) {
-                    _transferFeeToken(round.feeToken, payable(owner), leftoverFeeReward);
-                }
-                emit LeftoverRewardSent(
-                    _params.disputeID,
-                    _params.round,
-                    leftoverPnkReward,
-                    leftoverFeeReward,
-                    round.feeToken
-                );
-            }
-        }
-    }
-
-    /// @dev Executes a specified dispute's ruling.
-    /// @param _disputeID The ID of the dispute.
-    function executeRuling(uint256 _disputeID) external {
-        Dispute storage dispute = disputes[_disputeID];
-        if (dispute.period != Period.execution) revert NotExecutionPeriod();
-        if (dispute.ruled) revert RulingAlreadyExecuted();
-
-        (uint256 winningChoice, , ) = currentRuling(_disputeID);
-        dispute.ruled = true;
-        emit Ruling(dispute.arbitrated, _disputeID, winningChoice);
-        dispute.arbitrated.rule(_disputeID, winningChoice);
-    }
-
-    // ************************************* //
-    // *           Public Views            * //
-    // ************************************* //
-
-    /// @dev Compute the cost of arbitration denominated in ETH.
-    ///      It is recommended not to increase it often, as it can be highly time and gas consuming for the arbitrated contracts to cope with fee augmentation.
-    /// @param _extraData Additional info about the dispute. We use it to pass the ID of the dispute's court (first 32 bytes), the minimum number of jurors required (next 32 bytes) and the ID of the specific dispute kit (last 32 bytes).
-    /// @return cost The arbitration cost in ETH.
-    function arbitrationCost(bytes memory _extraData) public view override returns (uint256 cost) {
-        (uint96 courtID, uint256 minJurors, ) = _extraDataToCourtIDMinJurorsDisputeKit(_extraData);
-        cost = courts[courtID].feeForJuror * minJurors;
-    }
-
-    /// @dev Compute the cost of arbitration denominated in `_feeToken`.
-    ///      It is recommended not to increase it often, as it can be highly time and gas consuming for the arbitrated contracts to cope with fee augmentation.
-    /// @param _extraData Additional info about the dispute. We use it to pass the ID of the dispute's court (first 32 bytes), the minimum number of jurors required (next 32 bytes) and the ID of the specific dispute kit (last 32 bytes).
-    /// @param _feeToken The ERC20 token used to pay fees.
-    /// @return cost The arbitration cost in `_feeToken`.
-    function arbitrationCost(bytes calldata _extraData, IERC20 _feeToken) public view override returns (uint256 cost) {
-        cost = convertEthToTokenAmount(_feeToken, arbitrationCost(_extraData));
-    }
-
-    /// @dev Gets the cost of appealing a specified dispute.
-    /// @param _disputeID The ID of the dispute.
-    /// @return cost The appeal cost.
-    function appealCost(uint256 _disputeID) public view returns (uint256 cost) {
-        Dispute storage dispute = disputes[_disputeID];
-        Round storage round = dispute.rounds[dispute.rounds.length - 1];
-        Court storage court = courts[dispute.courtID];
-
-        (, uint256 newDisputeKitID, bool courtJump, ) = _getCourtAndDisputeKitJumps(dispute, round, court, _disputeID);
-
-        uint256 nbVotesAfterAppeal = disputeKits[newDisputeKitID].getNbVotesAfterAppeal(
-            disputeKits[round.disputeKitID],
-            round.nbVotes
-        );
-
-        if (courtJump) {
-            // Jump to parent court.
-            if (dispute.courtID == GENERAL_COURT) {
-                // TODO: Handle the forking when appealed in General court.
-                cost = NON_PAYABLE_AMOUNT; // Get the cost of the parent court.
-            } else {
-                cost = courts[court.parent].feeForJuror * nbVotesAfterAppeal;
-            }
-        } else {
-            // Stay in current court.
-            cost = court.feeForJuror * nbVotesAfterAppeal;
-        }
-    }
-
-    /// @dev Gets the start and the end of a specified dispute's current appeal period.
-    /// @param _disputeID The ID of the dispute.
-    /// @return start The start of the appeal period.
-    /// @return end The end of the appeal period.
-    function appealPeriod(uint256 _disputeID) external view returns (uint256 start, uint256 end) {
-        Dispute storage dispute = disputes[_disputeID];
-        if (dispute.period == Period.appeal) {
-            start = dispute.lastPeriodChange;
-            end = dispute.lastPeriodChange + courts[dispute.courtID].timesPerPeriod[uint256(Period.appeal)];
-        } else {
-            start = 0;
-            end = 0;
-        }
-    }
-
-    /// @dev Gets the current ruling of a specified dispute.
-    /// @param _disputeID The ID of the dispute.
-    /// @return ruling The current ruling.
-    /// @return tied Whether it's a tie or not.
-    /// @return overridden Whether the ruling was overridden by appeal funding or not.
-    function currentRuling(uint256 _disputeID) public view returns (uint256 ruling, bool tied, bool overridden) {
-        Dispute storage dispute = disputes[_disputeID];
-        Round storage round = dispute.rounds[dispute.rounds.length - 1];
-        IDisputeKit disputeKit = disputeKits[round.disputeKitID];
-        (ruling, tied, overridden) = disputeKit.currentRuling(_disputeID);
-    }
-
-    /// @dev Gets the round info for a specified dispute and round.
-    /// @dev This function must not be called from a non-view function because it returns a dynamic array which might be very large, theoretically exceeding the block gas limit.
-    /// @param _disputeID The ID of the dispute.
-    /// @param _round The round to get the info for.
-    /// @return round The round info.
-    function getRoundInfo(uint256 _disputeID, uint256 _round) external view returns (Round memory) {
-        return disputes[_disputeID].rounds[_round];
-    }
-
-    /// @dev Gets the PNK at stake per juror for a specified dispute and round.
-    /// @param _disputeID The ID of the dispute.
-    /// @param _round The round to get the info for.
-    /// @return pnkAtStakePerJuror The PNK at stake per juror.
-    function getPnkAtStakePerJuror(uint256 _disputeID, uint256 _round) external view returns (uint256) {
-        return disputes[_disputeID].rounds[_round].pnkAtStakePerJuror;
-    }
-
-    /// @dev Gets the number of rounds for a specified dispute.
-    /// @param _disputeID The ID of the dispute.
-    /// @return The number of rounds.
-    function getNumberOfRounds(uint256 _disputeID) external view returns (uint256) {
-        return disputes[_disputeID].rounds.length;
-    }
-
-    /// @dev Checks if a given dispute kit is supported by a given court.
-    /// @param _courtID The ID of the court to check the support for.
-    /// @param _disputeKitID The ID of the dispute kit to check the support for.
-    /// @return Whether the dispute kit is supported or not.
-    function isSupported(uint96 _courtID, uint256 _disputeKitID) external view returns (bool) {
-        return courts[_courtID].supportedDisputeKits[_disputeKitID];
-    }
-
-    /// @dev Gets the timesPerPeriod array for a given court.
-    /// @param _courtID The ID of the court to get the times from.
-    /// @return timesPerPeriod The timesPerPeriod array for the given court.
-    function getTimesPerPeriod(uint96 _courtID) external view returns (uint256[4] memory timesPerPeriod) {
-        timesPerPeriod = courts[_courtID].timesPerPeriod;
-    }
-
-    // ************************************* //
-    // *   Public Views for Dispute Kits   * //
-    // ************************************* //
-
-    /// @dev Gets the number of votes permitted for the specified dispute in the latest round.
-    /// @param _disputeID The ID of the dispute.
-    function getNumberOfVotes(uint256 _disputeID) external view returns (uint256) {
-        Dispute storage dispute = disputes[_disputeID];
-        return dispute.rounds[dispute.rounds.length - 1].nbVotes;
-    }
-
-    /// @dev Returns true if the dispute kit will be switched to a parent DK.
-    /// @param _disputeID The ID of the dispute.
-    /// @return Whether DK will be switched or not.
-    function isDisputeKitJumping(uint256 _disputeID) external view returns (bool) {
-        Dispute storage dispute = disputes[_disputeID];
-        Round storage round = dispute.rounds[dispute.rounds.length - 1];
-        Court storage court = courts[dispute.courtID];
-
-        if (!_isCourtJumping(round, court, _disputeID)) {
-            return false;
-        }
-
-        // Jump if the parent court doesn't support the current DK.
-        return !courts[court.parent].supportedDisputeKits[round.disputeKitID];
-    }
-
-    function getDisputeKitsLength() external view returns (uint256) {
-        return disputeKits.length;
-    }
-
-    function convertEthToTokenAmount(IERC20 _toToken, uint256 _amountInEth) public view returns (uint256) {
-        return (_amountInEth * 10 ** currencyRates[_toToken].rateDecimals) / currencyRates[_toToken].rateInEth;
-    }
-
-    // ************************************* //
-    // *            Internal               * //
-    // ************************************* //
-
-    /// @dev Returns true if the round is jumping to a parent court.
-    /// @param _round The round to check.
-    /// @param _court The court to check.
-    /// @return Whether the round is jumping to a parent court or not.
-    function _isCourtJumping(
-        Round storage _round,
-        Court storage _court,
-        uint256 _disputeID
-    ) internal view returns (bool) {
-        return
-            disputeKits[_round.disputeKitID].earlyCourtJump(_disputeID) || _round.nbVotes >= _court.jurorsForCourtJump;
-    }
-
-    function _getCourtAndDisputeKitJumps(
-        Dispute storage _dispute,
-        Round storage _round,
-        Court storage _court,
-        uint256 _disputeID
-    ) internal view returns (uint96 newCourtID, uint256 newDisputeKitID, bool courtJump, bool disputeKitJump) {
-        newCourtID = _dispute.courtID;
-        newDisputeKitID = _round.disputeKitID;
-
-        if (!_isCourtJumping(_round, _court, _disputeID)) return (newCourtID, newDisputeKitID, false, false);
-
-        // Jump to parent court.
-        newCourtID = courts[newCourtID].parent;
-        courtJump = true;
-
-        if (!courts[newCourtID].supportedDisputeKits[newDisputeKitID]) {
-            // The current Dispute Kit is not compatible with the new court, jump to another Dispute Kit.
-            newDisputeKitID = disputeKits[_round.disputeKitID].getJumpDisputeKitID();
-            if (newDisputeKitID == NULL_DISPUTE_KIT || !courts[newCourtID].supportedDisputeKits[newDisputeKitID]) {
-                // The new Dispute Kit is not defined or still not compatible, fall back to `DisputeKitClassic` which is always supported.
-                newDisputeKitID = DISPUTE_KIT_CLASSIC;
-            }
-            disputeKitJump = true;
-        }
-    }
-
-    /// @dev Internal function to transfer fee tokens (ETH or ERC20)
-    /// @param _feeToken The token to transfer (NATIVE_CURRENCY for ETH).
-    /// @param _recipient The recipient address.
-    /// @param _amount The amount to transfer.
-    function _transferFeeToken(IERC20 _feeToken, address payable _recipient, uint256 _amount) internal {
-        if (_feeToken == NATIVE_CURRENCY) {
-            _recipient.safeSend(_amount, wNative);
-        } else {
-            _feeToken.safeTransfer(_recipient, _amount);
-        }
-    }
-
-    /// @dev Applies degree of coherence to an amount
-    /// @param _amount The base amount to apply coherence to.
-    /// @param _coherence The degree of coherence in basis points.
-    /// @return The amount after applying the degree of coherence.
-    function _applyCoherence(uint256 _amount, uint256 _coherence) internal pure returns (uint256) {
-        return (_amount * _coherence) / ONE_BASIS_POINT;
-    }
-
-    /// @dev Calculates PNK at stake per juror based on court parameters
-    /// @param _minStake The minimum stake for the court.
-    /// @param _alpha The alpha parameter for the court in basis points.
-    /// @return The amount of PNK at stake per juror.
-    function _calculatePnkAtStake(uint256 _minStake, uint256 _alpha) internal pure returns (uint256) {
-        return (_minStake * _alpha) / ONE_BASIS_POINT;
-    }
-
-    /// @dev Toggles the dispute kit support for a given court.
-    /// @param _courtID The ID of the court to toggle the support for.
-    /// @param _disputeKitID The ID of the dispute kit to toggle the support for.
-    /// @param _enable Whether to enable or disable the support. Note that classic dispute kit should always be enabled.
-    function _enableDisputeKit(uint96 _courtID, uint256 _disputeKitID, bool _enable) internal {
-        courts[_courtID].supportedDisputeKits[_disputeKitID] = _enable;
-        emit DisputeKitEnabled(_courtID, _disputeKitID, _enable);
-    }
-
-    /// @dev If called only once then set _onError to Revert, otherwise set it to Return
-    /// @param _account The account to set the stake for.
-    /// @param _courtID The ID of the court to set the stake for.
-    /// @param _newStake The new stake.
-    /// @param _noDelay True if the stake change should not be delayed.
-    /// @param _onError Whether to revert or return false on error.
-    /// @return Whether the stake was successfully set or not.
-    function _setStake(
-        address _account,
-        uint96 _courtID,
-        uint256 _newStake,
-        bool _noDelay,
-        OnError _onError
-    ) internal returns (bool) {
-        if (_courtID == FORKING_COURT || _courtID >= courts.length) {
-            _stakingFailed(_onError, StakingResult.CannotStakeInThisCourt); // Staking directly into the forking court is not allowed.
-            return false;
-        }
-        if (_newStake != 0 && _newStake < courts[_courtID].minStake) {
-            _stakingFailed(_onError, StakingResult.CannotStakeLessThanMinStake); // Staking less than the minimum stake is not allowed.
-            return false;
-        }
-        (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) = sortitionModule.validateStake(
-            _account,
-            _courtID,
-            _newStake,
-            _noDelay
-        );
-        if (stakingResult != StakingResult.Successful && stakingResult != StakingResult.Delayed) {
-            _stakingFailed(_onError, stakingResult);
-            return false;
-        } else if (stakingResult == StakingResult.Delayed) {
-            return true;
-        }
-        if (pnkDeposit > 0) {
-            if (!pinakion.safeTransferFrom(_account, address(this), pnkDeposit)) {
-                _stakingFailed(_onError, StakingResult.StakingTransferFailed);
-                return false;
-            }
-        }
-        if (pnkWithdrawal > 0) {
-            if (!pinakion.safeTransfer(_account, pnkWithdrawal)) {
-                _stakingFailed(_onError, StakingResult.UnstakingTransferFailed);
-                return false;
-            }
-        }
-        sortitionModule.setStake(_account, _courtID, pnkDeposit, pnkWithdrawal, _newStake);
-
-        return true;
-    }
-
-    /// @dev It may revert depending on the _onError parameter.
-    function _stakingFailed(OnError _onError, StakingResult _result) internal pure virtual {
-        if (_onError == OnError.Return) return;
-        if (_result == StakingResult.StakingTransferFailed) revert StakingTransferFailed();
-        if (_result == StakingResult.UnstakingTransferFailed) revert UnstakingTransferFailed();
-        if (_result == StakingResult.CannotStakeInMoreCourts) revert StakingInTooManyCourts();
-        if (_result == StakingResult.CannotStakeInThisCourt) revert StakingNotPossibleInThisCourt();
-        if (_result == StakingResult.CannotStakeLessThanMinStake) revert StakingLessThanCourtMinStake();
-        if (_result == StakingResult.CannotStakeZeroWhenNoStake) revert StakingZeroWhenNoStake();
-    }
-
-    /// @dev Gets a court ID, the minimum number of jurors and an ID of a dispute kit from a specified extra data bytes array.
-    /// Note that if extradata contains an incorrect value then this value will be switched to default.
-    /// @param _extraData The extra data bytes array. The first 32 bytes are the court ID, the next are the minimum number of jurors and the last are the dispute kit ID.
-    /// @return courtID The court ID.
-    /// @return minJurors The minimum number of jurors required.
-    /// @return disputeKitID The ID of the dispute kit.
-    function _extraDataToCourtIDMinJurorsDisputeKit(
-        bytes memory _extraData
-    ) internal view returns (uint96 courtID, uint256 minJurors, uint256 disputeKitID) {
-        // Note that if the extradata doesn't contain 32 bytes for the dispute kit ID it'll return the default 0 index.
-        if (_extraData.length >= 64) {
-            assembly {
-                // solium-disable-line security/no-inline-assembly
-                courtID := mload(add(_extraData, 0x20))
-                minJurors := mload(add(_extraData, 0x40))
-                disputeKitID := mload(add(_extraData, 0x60))
-            }
-            if (courtID == FORKING_COURT || courtID >= courts.length) {
-                courtID = GENERAL_COURT;
-            }
-            if (minJurors == 0) {
-                minJurors = DEFAULT_NB_OF_JURORS;
-            }
-            if (disputeKitID == NULL_DISPUTE_KIT || disputeKitID >= disputeKits.length) {
-                disputeKitID = DISPUTE_KIT_CLASSIC; // 0 index is not used.
-            }
-        } else {
-            courtID = GENERAL_COURT;
-            minJurors = DEFAULT_NB_OF_JURORS;
-            disputeKitID = DISPUTE_KIT_CLASSIC;
-        }
-    }
-
-    // ************************************* //
-    // *              Errors               * //
-    // ************************************* //
-
-    error OwnerOnly();
-    error GuardianOrOwnerOnly();
-    error DisputeKitOnly();
-    error SortitionModuleOnly();
-    error UnsuccessfulCall();
-    error InvalidDisputKitParent();
-    error MinStakeLowerThanParentCourt();
-    error UnsupportedDisputeKit();
-    error InvalidForkingCourtAsParent();
-    error WrongDisputeKitIndex();
-    error CannotDisableClassicDK();
-    error StakingInTooManyCourts();
-    error StakingNotPossibleInThisCourt();
-    error StakingLessThanCourtMinStake();
-    error StakingTransferFailed();
-    error UnstakingTransferFailed();
-    error ArbitrationFeesNotEnough();
-    error DisputeKitNotSupportedByCourt();
-    error MustSupportDisputeKitClassic();
-    error TokenNotAccepted();
-    error EvidenceNotPassedAndNotAppeal();
-    error DisputeStillDrawing();
-    error CommitPeriodNotPassed();
-    error VotePeriodNotPassed();
-    error AppealPeriodNotPassed();
-    error NotEvidencePeriod();
-    error AppealFeesNotEnough();
-    error DisputeNotAppealable();
-    error NotExecutionPeriod();
-    error RulingAlreadyExecuted();
-    error DisputePeriodIsFinal();
-    error TransferFailed();
-    error WhenNotPausedOnly();
-    error WhenPausedOnly();
-    error StakingZeroWhenNoStake();
-}
diff --git a/contracts/src/arbitration/KlerosCoreNeo.sol b/contracts/src/arbitration/KlerosCoreNeo.sol
deleted file mode 100644
index 8f0a413b3..000000000
--- a/contracts/src/arbitration/KlerosCoreNeo.sol
+++ /dev/null
@@ -1,138 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.24;
-
-import {KlerosCoreBase, IDisputeKit, ISortitionModule, IERC20, OnError, StakingResult} from "./KlerosCoreBase.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-
-/// @title KlerosCoreNeo
-/// Core arbitrator contract for Kleros v2.
-/// Note that this contract trusts the PNK token, the dispute kit and the sortition module contracts.
-contract KlerosCoreNeo is KlerosCoreBase {
-    string public constant override version = "2.0.0";
-
-    // ************************************* //
-    // *             Storage               * //
-    // ************************************* //
-
-    mapping(address => bool) public arbitrableWhitelist; // Arbitrable whitelist.
-    IERC721 public jurorNft; // Eligible jurors NFT.
-
-    // ************************************* //
-    // *            Constructor            * //
-    // ************************************* //
-
-    /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
-        _disableInitializers();
-    }
-
-    /// @dev Initializer (constructor equivalent for upgradable contracts).
-    /// @param _owner The owner's address.
-    /// @param _guardian The guardian's address.
-    /// @param _pinakion The address of the token contract.
-    /// @param _jurorProsecutionModule The address of the juror prosecution module.
-    /// @param _disputeKit The address of the default dispute kit.
-    /// @param _hiddenVotes The `hiddenVotes` property value of the general court.
-    /// @param _courtParameters Numeric parameters of General court (minStake, alpha, feeForJuror and jurorsForCourtJump respectively).
-    /// @param _timesPerPeriod The `timesPerPeriod` property value of the general court.
-    /// @param _sortitionExtraData The extra data for sortition module.
-    /// @param _sortitionModuleAddress The sortition module responsible for sortition of the jurors.
-    /// @param _jurorNft NFT contract to vet the jurors.
-    /// @param _wNative The wrapped native token address, typically wETH.
-    function initialize(
-        address _owner,
-        address _guardian,
-        IERC20 _pinakion,
-        address _jurorProsecutionModule,
-        IDisputeKit _disputeKit,
-        bool _hiddenVotes,
-        uint256[4] memory _courtParameters,
-        uint256[4] memory _timesPerPeriod,
-        bytes memory _sortitionExtraData,
-        ISortitionModule _sortitionModuleAddress,
-        IERC721 _jurorNft,
-        address _wNative
-    ) external reinitializer(2) {
-        __KlerosCoreBase_initialize(
-            _owner,
-            _guardian,
-            _pinakion,
-            _jurorProsecutionModule,
-            _disputeKit,
-            _hiddenVotes,
-            _courtParameters,
-            _timesPerPeriod,
-            _sortitionExtraData,
-            _sortitionModuleAddress,
-            _wNative
-        );
-        jurorNft = _jurorNft;
-    }
-
-    // ************************************* //
-    // *             Governance            * //
-    // ************************************* //
-
-    /// @dev Access Control to perform implementation upgrades (UUPS Proxiable)
-    ///      Only the owner can perform upgrades (`onlyByOwner`)
-    function _authorizeUpgrade(address) internal view override onlyByOwner {
-        // NOP
-    }
-
-    /// @dev Changes the `jurorNft` storage variable.
-    /// @param _jurorNft The new value for the `jurorNft` storage variable.
-    function changeJurorNft(IERC721 _jurorNft) external onlyByOwner {
-        jurorNft = _jurorNft;
-    }
-
-    /// @dev Adds or removes an arbitrable from whitelist.
-    /// @param _arbitrable Arbitrable address.
-    /// @param _allowed Whether add or remove permission.
-    function changeArbitrableWhitelist(address _arbitrable, bool _allowed) external onlyByOwner {
-        arbitrableWhitelist[_arbitrable] = _allowed;
-    }
-
-    // ************************************* //
-    // *         State Modifiers           * //
-    // ************************************* //
-
-    /// @dev Sets the caller's stake in a court.
-    /// Note: Staking and unstaking is forbidden during pause.
-    /// @param _courtID The ID of the court.
-    /// @param _newStake The new stake.
-    /// Note that the existing delayed stake will be nullified as non-relevant.
-    function setStake(uint96 _courtID, uint256 _newStake) external override whenNotPaused {
-        if (jurorNft.balanceOf(msg.sender) == 0) revert NotEligibleForStaking();
-        super._setStake(msg.sender, _courtID, _newStake, false, OnError.Revert);
-    }
-
-    // ************************************* //
-    // *            Internal               * //
-    // ************************************* //
-
-    function _createDispute(
-        uint256 _numberOfChoices,
-        bytes memory _extraData,
-        IERC20 _feeToken,
-        uint256 _feeAmount
-    ) internal override returns (uint256 disputeID) {
-        if (!arbitrableWhitelist[msg.sender]) revert ArbitrableNotWhitelisted();
-        return super._createDispute(_numberOfChoices, _extraData, _feeToken, _feeAmount);
-    }
-
-    function _stakingFailed(OnError _onError, StakingResult _result) internal pure override {
-        super._stakingFailed(_onError, _result);
-        if (_result == StakingResult.CannotStakeMoreThanMaxStakePerJuror) revert StakingMoreThanMaxStakePerJuror();
-        if (_result == StakingResult.CannotStakeMoreThanMaxTotalStaked) revert StakingMoreThanMaxTotalStaked();
-    }
-
-    // ************************************* //
-    // *              Errors               * //
-    // ************************************* //
-
-    error NotEligibleForStaking();
-    error StakingMoreThanMaxStakePerJuror();
-    error StakingMoreThanMaxTotalStaked();
-    error ArbitrableNotWhitelisted();
-}
diff --git a/contracts/src/arbitration/SortitionModule.sol b/contracts/src/arbitration/SortitionModule.sol
index bd0f6e007..bf61255ae 100644
--- a/contracts/src/arbitration/SortitionModule.sol
+++ b/contracts/src/arbitration/SortitionModule.sol
@@ -2,13 +2,98 @@
 
 pragma solidity ^0.8.24;
 
-import {SortitionModuleBase, KlerosCore, IRNG} from "./SortitionModuleBase.sol";
+import {KlerosCore} from "./KlerosCore.sol";
+import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
+import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
+import {Initializable} from "../proxy/Initializable.sol";
+import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
+import {SortitionTrees, TreeKey, CourtID} from "../libraries/SortitionTrees.sol";
+import {IRNG} from "../rng/IRNG.sol";
+import "../libraries/Constants.sol";
 
 /// @title SortitionModule
 /// @dev A factory of trees that keeps track of staked values for sortition.
-contract SortitionModule is SortitionModuleBase {
+contract SortitionModule is ISortitionModule, Initializable, UUPSProxiable {
+    using SortitionTrees for SortitionTrees.Tree;
+    using SortitionTrees for mapping(TreeKey key => SortitionTrees.Tree);
+
     string public constant override version = "2.0.0";
 
+    // ************************************* //
+    // *         Enums / Structs           * //
+    // ************************************* //
+
+    struct DelayedStake {
+        address account; // The address of the juror.
+        uint96 courtID; // The ID of the court.
+        uint256 stake; // The new stake.
+        bool alreadyTransferred; // DEPRECATED. True if tokens were already transferred before delayed stake's execution.
+    }
+
+    struct Juror {
+        uint96[] courtIDs; // The IDs of courts where the juror's stake path ends. A stake path is a path from the general court to a court the juror directly staked in using `_setStake`.
+        uint256 stakedPnk; // The juror's total amount of tokens staked in subcourts. PNK balance including locked PNK and penalty deductions.
+        uint256 lockedPnk; // The juror's total amount of tokens locked in disputes.
+    }
+
+    // ************************************* //
+    // *             Storage               * //
+    // ************************************* //
+
+    address public owner; // The owner of the contract.
+    KlerosCore public core; // The core arbitrator contract.
+    Phase public phase; // The current phase.
+    uint256 public minStakingTime; // The time after which the phase can be switched to Drawing if there are open disputes.
+    uint256 public maxDrawingTime; // The time after which the phase can be switched back to Staking.
+    uint256 public lastPhaseChange; // The last time the phase was changed.
+    uint256 public randomNumberRequestBlock; // DEPRECATED: to be removed in the next redeploy
+    uint256 public disputesWithoutJurors; // The number of disputes that have not finished drawing jurors.
+    IRNG public rng; // The random number generator.
+    uint256 public randomNumber; // Random number returned by RNG.
+    uint256 public rngLookahead; // DEPRECATED: to be removed in the next redeploy
+    uint256 public delayedStakeWriteIndex; // The index of the last `delayedStake` item that was written to the array. 0 index is skipped.
+    uint256 public delayedStakeReadIndex; // The index of the next `delayedStake` item that should be processed. Starts at 1 because 0 index is skipped.
+    mapping(TreeKey key => SortitionTrees.Tree) sortitionSumTrees; // The mapping of sortition trees by keys.
+    mapping(address account => Juror) public jurors; // The jurors.
+    mapping(uint256 => DelayedStake) public delayedStakes; // Stores the stakes that were changed during Drawing phase, to update them when the phase is switched to Staking.
+    mapping(address jurorAccount => mapping(uint96 courtId => uint256)) public latestDelayedStakeIndex; // DEPRECATED. Maps the juror to its latest delayed stake. If there is already a delayed stake for this juror then it'll be replaced. latestDelayedStakeIndex[juror][courtID].
+    uint256 public maxStakePerJuror;
+    uint256 public maxTotalStaked;
+    uint256 public totalStaked;
+
+    // ************************************* //
+    // *              Events               * //
+    // ************************************* //
+
+    /// @notice Emitted when a juror stakes in a court.
+    /// @param _address The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @param _amount The amount of tokens staked in the court.
+    /// @param _amountAllCourts The amount of tokens staked in all courts.
+    event StakeSet(address indexed _address, uint256 _courtID, uint256 _amount, uint256 _amountAllCourts);
+
+    /// @notice Emitted when a juror's stake is delayed.
+    /// @param _address The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @param _amount The amount of tokens staked in the court.
+    event StakeDelayed(address indexed _address, uint96 indexed _courtID, uint256 _amount);
+
+    /// @notice Emitted when a juror's stake is locked.
+    /// @param _address The address of the juror.
+    /// @param _relativeAmount The amount of tokens locked.
+    /// @param _unlock Whether the stake is locked or unlocked.
+    event StakeLocked(address indexed _address, uint256 _relativeAmount, bool _unlock);
+
+    /// @dev Emitted when leftover PNK is available.
+    /// @param _account The account of the juror.
+    /// @param _amount The amount of PNK available.
+    event LeftoverPNK(address indexed _account, uint256 _amount);
+
+    /// @dev Emitted when leftover PNK is withdrawn.
+    /// @param _account The account of the juror withdrawing PNK.
+    /// @param _amount The amount of PNK withdrawn.
+    event LeftoverPNKWithdrawn(address indexed _account, uint256 _amount);
+
     // ************************************* //
     // *            Constructor            * //
     // ************************************* //
@@ -24,14 +109,40 @@ contract SortitionModule is SortitionModuleBase {
     /// @param _minStakingTime Minimal time to stake
     /// @param _maxDrawingTime Time after which the drawing phase can be switched
     /// @param _rng The random number generator.
+    /// @param _maxStakePerJuror The maximum amount of PNK a juror can stake in a court.
+    /// @param _maxTotalStaked The maximum amount of PNK that can be staked in all courts.
     function initialize(
         address _owner,
         KlerosCore _core,
         uint256 _minStakingTime,
         uint256 _maxDrawingTime,
-        IRNG _rng
+        IRNG _rng,
+        uint256 _maxStakePerJuror,
+        uint256 _maxTotalStaked
     ) external initializer {
-        __SortitionModuleBase_initialize(_owner, _core, _minStakingTime, _maxDrawingTime, _rng);
+        owner = _owner;
+        core = _core;
+        minStakingTime = _minStakingTime;
+        maxDrawingTime = _maxDrawingTime;
+        lastPhaseChange = block.timestamp;
+        rng = _rng;
+        maxStakePerJuror = _maxStakePerJuror;
+        maxTotalStaked = _maxTotalStaked;
+        delayedStakeReadIndex = 1;
+    }
+
+    // ************************************* //
+    // *        Function Modifiers         * //
+    // ************************************* //
+
+    modifier onlyByOwner() {
+        if (owner != msg.sender) revert OwnerOnly();
+        _;
+    }
+
+    modifier onlyByCore() {
+        if (address(core) != msg.sender) revert KlerosCoreOnly();
+        _;
     }
 
     // ************************************* //
@@ -40,7 +151,472 @@ contract SortitionModule is SortitionModuleBase {
 
     /// @dev Access Control to perform implementation upgrades (UUPS Proxiable)
     ///      Only the owner can perform upgrades (`onlyByOwner`)
-    function _authorizeUpgrade(address) internal view virtual override onlyByOwner {
+    function _authorizeUpgrade(address) internal view override onlyByOwner {
         // NOP
     }
+
+    /// @dev Changes the owner of the contract.
+    /// @param _owner The new owner.
+    function changeOwner(address _owner) external onlyByOwner {
+        owner = _owner;
+    }
+
+    /// @dev Changes the `minStakingTime` storage variable.
+    /// @param _minStakingTime The new value for the `minStakingTime` storage variable.
+    function changeMinStakingTime(uint256 _minStakingTime) external onlyByOwner {
+        minStakingTime = _minStakingTime;
+    }
+
+    /// @dev Changes the `maxDrawingTime` storage variable.
+    /// @param _maxDrawingTime The new value for the `maxDrawingTime` storage variable.
+    function changeMaxDrawingTime(uint256 _maxDrawingTime) external onlyByOwner {
+        maxDrawingTime = _maxDrawingTime;
+    }
+
+    /// @dev Changes the `rng` storage variable.
+    /// @param _rng The new random number generator.
+    function changeRandomNumberGenerator(IRNG _rng) external onlyByOwner {
+        rng = _rng;
+        if (phase == Phase.generating) {
+            rng.requestRandomness();
+        }
+    }
+
+    function changeMaxStakePerJuror(uint256 _maxStakePerJuror) external onlyByOwner {
+        maxStakePerJuror = _maxStakePerJuror;
+    }
+
+    function changeMaxTotalStaked(uint256 _maxTotalStaked) external onlyByOwner {
+        maxTotalStaked = _maxTotalStaked;
+    }
+
+    // ************************************* //
+    // *         State Modifiers           * //
+    // ************************************* //
+
+    function passPhase() external {
+        if (phase == Phase.staking) {
+            if (block.timestamp - lastPhaseChange < minStakingTime) revert MinStakingTimeNotPassed();
+            if (disputesWithoutJurors == 0) revert NoDisputesThatNeedJurors();
+            rng.requestRandomness();
+            phase = Phase.generating;
+        } else if (phase == Phase.generating) {
+            randomNumber = rng.receiveRandomness();
+            if (randomNumber == 0) revert RandomNumberNotReady();
+            phase = Phase.drawing;
+        } else if (phase == Phase.drawing) {
+            if (disputesWithoutJurors > 0 && block.timestamp - lastPhaseChange < maxDrawingTime) {
+                revert DisputesWithoutJurorsAndMaxDrawingTimeNotPassed();
+            }
+            phase = Phase.staking;
+        }
+
+        lastPhaseChange = block.timestamp;
+        emit NewPhase(phase);
+    }
+
+    /// @dev Create a sortition sum tree at the specified key.
+    /// @param _courtID The ID of the court.
+    /// @param _extraData Extra data that contains the number of children each node in the tree should have.
+    function createTree(uint96 _courtID, bytes memory _extraData) external override onlyByCore {
+        TreeKey key = CourtID.wrap(_courtID).toTreeKey();
+        uint256 K = _extraDataToTreeK(_extraData);
+        sortitionSumTrees.createTree(key, K);
+    }
+
+    /// @dev Executes the next delayed stakes.
+    /// @param _iterations The number of delayed stakes to execute.
+    function executeDelayedStakes(uint256 _iterations) external {
+        if (phase != Phase.staking) revert NotStakingPhase();
+        if (delayedStakeWriteIndex < delayedStakeReadIndex) revert NoDelayedStakeToExecute();
+
+        uint256 actualIterations = (delayedStakeReadIndex + _iterations) - 1 > delayedStakeWriteIndex
+            ? (delayedStakeWriteIndex - delayedStakeReadIndex) + 1
+            : _iterations;
+        uint256 newDelayedStakeReadIndex = delayedStakeReadIndex + actualIterations;
+
+        for (uint256 i = delayedStakeReadIndex; i < newDelayedStakeReadIndex; i++) {
+            DelayedStake storage delayedStake = delayedStakes[i];
+            core.setStakeBySortitionModule(delayedStake.account, delayedStake.courtID, delayedStake.stake);
+            delete delayedStakes[i];
+        }
+        delayedStakeReadIndex = newDelayedStakeReadIndex;
+    }
+
+    function createDisputeHook(uint256 /*_disputeID*/, uint256 /*_roundID*/) external override onlyByCore {
+        disputesWithoutJurors++;
+    }
+
+    function postDrawHook(uint256 /*_disputeID*/, uint256 /*_roundID*/) external override onlyByCore {
+        disputesWithoutJurors--;
+    }
+
+    /// @dev Saves the random number to use it in sortition. Not used by this contract because the storing of the number is inlined in passPhase().
+    /// @param _randomNumber Random number returned by RNG contract.
+    function notifyRandomNumber(uint256 _randomNumber) public override {}
+
+    /// @dev Validate the specified juror's new stake for a court.
+    /// Note: no state changes should be made when returning stakingResult != Successful, otherwise delayed stakes might break invariants.
+    /// @param _account The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @param _newStake The new stake.
+    /// @param _noDelay True if the stake change should not be delayed.
+    /// @return pnkDeposit The amount of PNK to be deposited.
+    /// @return pnkWithdrawal The amount of PNK to be withdrawn.
+    /// @return stakingResult The result of the staking operation.
+    function validateStake(
+        address _account,
+        uint96 _courtID,
+        uint256 _newStake,
+        bool _noDelay
+    ) external override onlyByCore returns (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) {
+        (pnkDeposit, pnkWithdrawal, stakingResult) = _validateStake(_account, _courtID, _newStake, _noDelay);
+    }
+
+    function _validateStake(
+        address _account,
+        uint96 _courtID,
+        uint256 _newStake,
+        bool _noDelay
+    ) internal returns (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) {
+        Juror storage juror = jurors[_account];
+        uint256 currentStake = stakeOf(_account, _courtID);
+        bool stakeIncrease = _newStake > currentStake;
+        uint256 stakeChange = stakeIncrease ? _newStake - currentStake : currentStake - _newStake;
+
+        uint256 nbCourts = juror.courtIDs.length;
+        if (currentStake == 0 && nbCourts >= MAX_STAKE_PATHS) {
+            return (0, 0, StakingResult.CannotStakeInMoreCourts); // Prevent staking beyond MAX_STAKE_PATHS but unstaking is always allowed.
+        }
+
+        if (currentStake == 0 && _newStake == 0) {
+            return (0, 0, StakingResult.CannotStakeZeroWhenNoStake); // Forbid staking 0 amount when current stake is 0 to avoid flaky behaviour.
+        }
+
+        if (stakeIncrease) {
+            // Check if the stake increase is within the limits.
+            if (juror.stakedPnk + stakeChange > maxStakePerJuror || currentStake + stakeChange > maxStakePerJuror) {
+                return (0, 0, StakingResult.CannotStakeMoreThanMaxStakePerJuror);
+            }
+            if (totalStaked + stakeChange > maxTotalStaked) {
+                return (0, 0, StakingResult.CannotStakeMoreThanMaxTotalStaked);
+            }
+        }
+
+        if (phase != Phase.staking && !_noDelay) {
+            // Store the stake change as delayed, to be applied when the phase switches back to Staking.
+            DelayedStake storage delayedStake = delayedStakes[++delayedStakeWriteIndex];
+            delayedStake.account = _account;
+            delayedStake.courtID = _courtID;
+            delayedStake.stake = _newStake;
+            emit StakeDelayed(_account, _courtID, _newStake);
+            return (pnkDeposit, pnkWithdrawal, StakingResult.Delayed);
+        }
+
+        // Current phase is Staking: set stakes.
+        if (stakeIncrease) {
+            pnkDeposit = stakeChange;
+            totalStaked += stakeChange;
+        } else {
+            pnkWithdrawal = stakeChange;
+            uint256 possibleWithdrawal = juror.stakedPnk > juror.lockedPnk ? juror.stakedPnk - juror.lockedPnk : 0;
+            if (pnkWithdrawal > possibleWithdrawal) {
+                // Ensure locked tokens remain in the contract. They can only be released during Execution.
+                pnkWithdrawal = possibleWithdrawal;
+            }
+            totalStaked -= pnkWithdrawal;
+        }
+        return (pnkDeposit, pnkWithdrawal, StakingResult.Successful);
+    }
+
+    /// @dev Update the state of the stakes, called by KC at the end of setStake flow.
+    /// `O(n + p * log_k(j))` where
+    /// `n` is the number of courts the juror has staked in,
+    /// `p` is the depth of the court tree,
+    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
+    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
+    /// @param _account The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @param _pnkDeposit The amount of PNK to be deposited.
+    /// @param _pnkWithdrawal The amount of PNK to be withdrawn.
+    /// @param _newStake The new stake.
+    function setStake(
+        address _account,
+        uint96 _courtID,
+        uint256 _pnkDeposit,
+        uint256 _pnkWithdrawal,
+        uint256 _newStake
+    ) external override onlyByCore {
+        _setStake(_account, _courtID, _pnkDeposit, _pnkWithdrawal, _newStake);
+    }
+
+    /// @dev Update the state of the stakes with a PNK reward deposit, called by KC during rewards execution.
+    /// `O(n + p * log_k(j))` where
+    /// `n` is the number of courts the juror has staked in,
+    /// `p` is the depth of the court tree,
+    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
+    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
+    /// @param _account The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @param _penalty The amount of PNK to be deducted.
+    /// @return pnkBalance The updated total PNK balance of the juror, including the penalty.
+    /// @return newCourtStake The updated stake of the juror in the court.
+    /// @return availablePenalty The amount of PNK that was actually deducted.
+    function setStakePenalty(
+        address _account,
+        uint96 _courtID,
+        uint256 _penalty
+    ) external override onlyByCore returns (uint256 pnkBalance, uint256 newCourtStake, uint256 availablePenalty) {
+        Juror storage juror = jurors[_account];
+        availablePenalty = _penalty;
+        newCourtStake = stakeOf(_account, _courtID);
+        if (juror.stakedPnk < _penalty) {
+            availablePenalty = juror.stakedPnk;
+        }
+
+        if (availablePenalty == 0) return (juror.stakedPnk, newCourtStake, 0); // No penalty to apply.
+
+        uint256 currentStake = stakeOf(_account, _courtID);
+        uint256 newStake = 0;
+        if (currentStake >= availablePenalty) {
+            newStake = currentStake - availablePenalty;
+        }
+        _setStake(_account, _courtID, 0, availablePenalty, newStake);
+        pnkBalance = juror.stakedPnk; // updated by _setStake()
+        newCourtStake = stakeOf(_account, _courtID); // updated by _setStake()
+    }
+
+    /// @dev Update the state of the stakes with a PNK reward deposit, called by KC during rewards execution.
+    /// `O(n + p * log_k(j))` where
+    /// `n` is the number of courts the juror has staked in,
+    /// `p` is the depth of the court tree,
+    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
+    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
+    /// @param _account The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @param _reward The amount of PNK to be deposited as a reward.
+    function setStakeReward(
+        address _account,
+        uint96 _courtID,
+        uint256 _reward
+    ) external override onlyByCore returns (bool success) {
+        if (_reward == 0) return true; // No reward to add.
+
+        uint256 currentStake = stakeOf(_account, _courtID);
+        if (currentStake == 0) return false; // Juror has been unstaked, don't increase their stake.
+
+        uint256 newStake = currentStake + _reward;
+        _setStake(_account, _courtID, _reward, 0, newStake);
+        return true;
+    }
+
+    function _setStake(
+        address _account,
+        uint96 _courtID,
+        uint256 _pnkDeposit,
+        uint256 _pnkWithdrawal,
+        uint256 _newStake
+    ) internal {
+        Juror storage juror = jurors[_account];
+        if (_pnkDeposit > 0) {
+            uint256 currentStake = stakeOf(_account, _courtID);
+            if (currentStake == 0) {
+                juror.courtIDs.push(_courtID);
+            }
+            // Increase juror's balance by deposited amount.
+            juror.stakedPnk += _pnkDeposit;
+        } else {
+            juror.stakedPnk -= _pnkWithdrawal;
+            if (_newStake == 0) {
+                // Cleanup
+                for (uint256 i = juror.courtIDs.length; i > 0; i--) {
+                    if (juror.courtIDs[i - 1] == _courtID) {
+                        juror.courtIDs[i - 1] = juror.courtIDs[juror.courtIDs.length - 1];
+                        juror.courtIDs.pop();
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Update the sortition sum tree.
+        bytes32 stakePathID = SortitionTrees.toStakePathID(_account, _courtID);
+        bool finished = false;
+        uint96 currentCourtID = _courtID;
+        while (!finished) {
+            // Tokens are also implicitly staked in parent courts through sortition module to increase the chance of being drawn.
+            TreeKey key = CourtID.wrap(currentCourtID).toTreeKey();
+            sortitionSumTrees[key].set(_newStake, stakePathID);
+            if (currentCourtID == GENERAL_COURT) {
+                finished = true;
+            } else {
+                (currentCourtID, , , , , , ) = core.courts(currentCourtID); // Get the parent court.
+            }
+        }
+        emit StakeSet(_account, _courtID, _newStake, juror.stakedPnk);
+    }
+
+    function lockStake(address _account, uint256 _relativeAmount) external override onlyByCore {
+        jurors[_account].lockedPnk += _relativeAmount;
+        emit StakeLocked(_account, _relativeAmount, false);
+    }
+
+    function unlockStake(address _account, uint256 _relativeAmount) external override onlyByCore {
+        Juror storage juror = jurors[_account];
+        juror.lockedPnk -= _relativeAmount;
+        emit StakeLocked(_account, _relativeAmount, true);
+
+        uint256 amount = getJurorLeftoverPNK(_account);
+        if (amount > 0) {
+            emit LeftoverPNK(_account, amount);
+        }
+    }
+
+    /// @dev Unstakes the inactive juror from all courts.
+    /// `O(n * (p * log_k(j)) )` where
+    /// `n` is the number of courts the juror has staked in,
+    /// `p` is the depth of the court tree,
+    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
+    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
+    /// @param _account The juror to unstake.
+    function forcedUnstakeAllCourts(address _account) external override onlyByCore {
+        uint96[] memory courtIDs = getJurorCourtIDs(_account);
+        for (uint256 j = courtIDs.length; j > 0; j--) {
+            core.setStakeBySortitionModule(_account, courtIDs[j - 1], 0);
+        }
+    }
+
+    /// @dev Unstakes the inactive juror from a specific court.
+    /// `O(n * (p * log_k(j)) )` where
+    /// `n` is the number of courts the juror has staked in,
+    /// `p` is the depth of the court tree,
+    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
+    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
+    /// @param _account The juror to unstake.
+    /// @param _courtID The ID of the court.
+    function forcedUnstake(address _account, uint96 _courtID) external override onlyByCore {
+        core.setStakeBySortitionModule(_account, _courtID, 0);
+    }
+
+    /// @dev Gives back the locked PNKs in case the juror fully unstaked earlier.
+    /// Note that since locked and staked PNK are async it is possible for the juror to have positive staked PNK balance
+    /// while having 0 stake in courts and 0 locked tokens (eg. when the juror fully unstaked during dispute and later got his tokens unlocked).
+    /// In this case the juror can use this function to withdraw the leftover tokens.
+    /// Also note that if the juror has some leftover PNK while not fully unstaked he'll have to manually unstake from all courts to trigger this function.
+    /// @param _account The juror whose PNK to withdraw.
+    function withdrawLeftoverPNK(address _account) external override {
+        // Can withdraw the leftover PNK if fully unstaked, has no tokens locked and has positive balance.
+        // This withdrawal can't be triggered by calling setStake() in KlerosCore because current stake is technically 0, thus it is done via separate function.
+        uint256 amount = getJurorLeftoverPNK(_account);
+        if (amount == 0) revert NotEligibleForWithdrawal();
+        jurors[_account].stakedPnk = 0;
+        core.transferBySortitionModule(_account, amount);
+        emit LeftoverPNKWithdrawn(_account, amount);
+    }
+
+    // ************************************* //
+    // *           Public Views            * //
+    // ************************************* //
+
+    /// @dev Draw an ID from a tree using a number.
+    /// Note that this function reverts if the sum of all values in the tree is 0.
+    /// @param _courtID The ID of the court.
+    /// @param _coreDisputeID Index of the dispute in Kleros Core.
+    /// @param _nonce Nonce to hash with random number.
+    /// @return drawnAddress The drawn address.
+    /// `O(k * log_k(n))` where
+    /// `k` is the maximum number of children per node in the tree,
+    ///  and `n` is the maximum number of nodes ever appended.
+    function draw(
+        uint96 _courtID,
+        uint256 _coreDisputeID,
+        uint256 _nonce
+    ) public view override returns (address drawnAddress, uint96 fromSubcourtID) {
+        if (phase != Phase.drawing) revert NotDrawingPhase();
+
+        TreeKey key = CourtID.wrap(_courtID).toTreeKey();
+        (drawnAddress, fromSubcourtID) = sortitionSumTrees[key].draw(_coreDisputeID, _nonce, randomNumber);
+    }
+
+    /// @dev Get the stake of a juror in a court.
+    /// @param _juror The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @return value The stake of the juror in the court.
+    function stakeOf(address _juror, uint96 _courtID) public view returns (uint256) {
+        bytes32 stakePathID = SortitionTrees.toStakePathID(_juror, _courtID);
+        TreeKey key = CourtID.wrap(_courtID).toTreeKey();
+        return sortitionSumTrees[key].stakeOf(stakePathID);
+    }
+
+    /// @dev Gets the balance of a juror in a court.
+    /// @param _juror The address of the juror.
+    /// @param _courtID The ID of the court.
+    /// @return totalStaked The total amount of tokens staked including locked tokens and penalty deductions. Equivalent to the effective stake in the General court.
+    /// @return totalLocked The total amount of tokens locked in disputes.
+    /// @return stakedInCourt The amount of tokens staked in the specified court including locked tokens and penalty deductions.
+    /// @return nbCourts The number of courts the juror has directly staked in.
+    function getJurorBalance(
+        address _juror,
+        uint96 _courtID
+    )
+        external
+        view
+        override
+        returns (uint256 totalStaked, uint256 totalLocked, uint256 stakedInCourt, uint256 nbCourts)
+    {
+        Juror storage juror = jurors[_juror];
+        totalStaked = juror.stakedPnk;
+        totalLocked = juror.lockedPnk;
+        stakedInCourt = stakeOf(_juror, _courtID);
+        nbCourts = juror.courtIDs.length;
+    }
+
+    /// @dev Gets the court identifiers where a specific `_juror` has staked.
+    /// @param _juror The address of the juror.
+    function getJurorCourtIDs(address _juror) public view override returns (uint96[] memory) {
+        return jurors[_juror].courtIDs;
+    }
+
+    function isJurorStaked(address _juror) external view override returns (bool) {
+        return jurors[_juror].stakedPnk > 0;
+    }
+
+    function getJurorLeftoverPNK(address _juror) public view override returns (uint256) {
+        Juror storage juror = jurors[_juror];
+        if (juror.courtIDs.length == 0 && juror.lockedPnk == 0) {
+            return juror.stakedPnk;
+        } else {
+            return 0;
+        }
+    }
+
+    // ************************************* //
+    // *            Internal               * //
+    // ************************************* //
+
+    function _extraDataToTreeK(bytes memory _extraData) internal pure returns (uint256 K) {
+        if (_extraData.length >= 32) {
+            assembly {
+                // solium-disable-line security/no-inline-assembly
+                K := mload(add(_extraData, 0x20))
+            }
+        } else {
+            K = DEFAULT_K;
+        }
+    }
+
+    // ************************************* //
+    // *              Errors               * //
+    // ************************************* //
+
+    error OwnerOnly();
+    error KlerosCoreOnly();
+    error MinStakingTimeNotPassed();
+    error NoDisputesThatNeedJurors();
+    error RandomNumberNotReady();
+    error DisputesWithoutJurorsAndMaxDrawingTimeNotPassed();
+    error NotStakingPhase();
+    error NoDelayedStakeToExecute();
+    error NotEligibleForWithdrawal();
+    error NotDrawingPhase();
 }
diff --git a/contracts/src/arbitration/SortitionModuleBase.sol b/contracts/src/arbitration/SortitionModuleBase.sol
deleted file mode 100644
index 3c528b017..000000000
--- a/contracts/src/arbitration/SortitionModuleBase.sol
+++ /dev/null
@@ -1,572 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.24;
-
-import {KlerosCore} from "./KlerosCore.sol";
-import {ISortitionModule} from "./interfaces/ISortitionModule.sol";
-import {IDisputeKit} from "./interfaces/IDisputeKit.sol";
-import {Initializable} from "../proxy/Initializable.sol";
-import {UUPSProxiable} from "../proxy/UUPSProxiable.sol";
-import {SortitionTrees, TreeKey, CourtID} from "../libraries/SortitionTrees.sol";
-import {IRNG} from "../rng/IRNG.sol";
-import "../libraries/Constants.sol";
-
-/// @title SortitionModuleBase
-/// @dev A factory of trees that keeps track of staked values for sortition.
-abstract contract SortitionModuleBase is ISortitionModule, Initializable, UUPSProxiable {
-    using SortitionTrees for SortitionTrees.Tree;
-    using SortitionTrees for mapping(TreeKey key => SortitionTrees.Tree);
-
-    // ************************************* //
-    // *         Enums / Structs           * //
-    // ************************************* //
-
-    struct DelayedStake {
-        address account; // The address of the juror.
-        uint96 courtID; // The ID of the court.
-        uint256 stake; // The new stake.
-        bool alreadyTransferred; // DEPRECATED. True if tokens were already transferred before delayed stake's execution.
-    }
-
-    struct Juror {
-        uint96[] courtIDs; // The IDs of courts where the juror's stake path ends. A stake path is a path from the general court to a court the juror directly staked in using `_setStake`.
-        uint256 stakedPnk; // The juror's total amount of tokens staked in subcourts. PNK balance including locked PNK and penalty deductions.
-        uint256 lockedPnk; // The juror's total amount of tokens locked in disputes.
-    }
-
-    // ************************************* //
-    // *             Storage               * //
-    // ************************************* //
-
-    address public owner; // The owner of the contract.
-    KlerosCore public core; // The core arbitrator contract.
-    Phase public phase; // The current phase.
-    uint256 public minStakingTime; // The time after which the phase can be switched to Drawing if there are open disputes.
-    uint256 public maxDrawingTime; // The time after which the phase can be switched back to Staking.
-    uint256 public lastPhaseChange; // The last time the phase was changed.
-    uint256 public randomNumberRequestBlock; // DEPRECATED: to be removed in the next redeploy
-    uint256 public disputesWithoutJurors; // The number of disputes that have not finished drawing jurors.
-    IRNG public rng; // The random number generator.
-    uint256 public randomNumber; // Random number returned by RNG.
-    uint256 public rngLookahead; // DEPRECATED: to be removed in the next redeploy
-    uint256 public delayedStakeWriteIndex; // The index of the last `delayedStake` item that was written to the array. 0 index is skipped.
-    uint256 public delayedStakeReadIndex; // The index of the next `delayedStake` item that should be processed. Starts at 1 because 0 index is skipped.
-    mapping(TreeKey key => SortitionTrees.Tree) sortitionSumTrees; // The mapping of sortition trees by keys.
-    mapping(address account => Juror) public jurors; // The jurors.
-    mapping(uint256 => DelayedStake) public delayedStakes; // Stores the stakes that were changed during Drawing phase, to update them when the phase is switched to Staking.
-    mapping(address jurorAccount => mapping(uint96 courtId => uint256)) public latestDelayedStakeIndex; // DEPRECATED. Maps the juror to its latest delayed stake. If there is already a delayed stake for this juror then it'll be replaced. latestDelayedStakeIndex[juror][courtID].
-
-    // ************************************* //
-    // *              Events               * //
-    // ************************************* //
-
-    /// @notice Emitted when a juror stakes in a court.
-    /// @param _address The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @param _amount The amount of tokens staked in the court.
-    /// @param _amountAllCourts The amount of tokens staked in all courts.
-    event StakeSet(address indexed _address, uint256 _courtID, uint256 _amount, uint256 _amountAllCourts);
-
-    /// @notice Emitted when a juror's stake is delayed.
-    /// @param _address The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @param _amount The amount of tokens staked in the court.
-    event StakeDelayed(address indexed _address, uint96 indexed _courtID, uint256 _amount);
-
-    /// @notice Emitted when a juror's stake is locked.
-    /// @param _address The address of the juror.
-    /// @param _relativeAmount The amount of tokens locked.
-    /// @param _unlock Whether the stake is locked or unlocked.
-    event StakeLocked(address indexed _address, uint256 _relativeAmount, bool _unlock);
-
-    /// @dev Emitted when leftover PNK is available.
-    /// @param _account The account of the juror.
-    /// @param _amount The amount of PNK available.
-    event LeftoverPNK(address indexed _account, uint256 _amount);
-
-    /// @dev Emitted when leftover PNK is withdrawn.
-    /// @param _account The account of the juror withdrawing PNK.
-    /// @param _amount The amount of PNK withdrawn.
-    event LeftoverPNKWithdrawn(address indexed _account, uint256 _amount);
-
-    // ************************************* //
-    // *            Constructor            * //
-    // ************************************* //
-
-    function __SortitionModuleBase_initialize(
-        address _owner,
-        KlerosCore _core,
-        uint256 _minStakingTime,
-        uint256 _maxDrawingTime,
-        IRNG _rng
-    ) internal onlyInitializing {
-        owner = _owner;
-        core = _core;
-        minStakingTime = _minStakingTime;
-        maxDrawingTime = _maxDrawingTime;
-        lastPhaseChange = block.timestamp;
-        rng = _rng;
-        delayedStakeReadIndex = 1;
-    }
-
-    // ************************************* //
-    // *        Function Modifiers         * //
-    // ************************************* //
-
-    modifier onlyByOwner() {
-        if (owner != msg.sender) revert OwnerOnly();
-        _;
-    }
-
-    modifier onlyByCore() {
-        if (address(core) != msg.sender) revert KlerosCoreOnly();
-        _;
-    }
-
-    // ************************************* //
-    // *             Governance            * //
-    // ************************************* //
-
-    /// @dev Changes the owner of the contract.
-    /// @param _owner The new owner.
-    function changeOwner(address _owner) external onlyByOwner {
-        owner = _owner;
-    }
-
-    /// @dev Changes the `minStakingTime` storage variable.
-    /// @param _minStakingTime The new value for the `minStakingTime` storage variable.
-    function changeMinStakingTime(uint256 _minStakingTime) external onlyByOwner {
-        minStakingTime = _minStakingTime;
-    }
-
-    /// @dev Changes the `maxDrawingTime` storage variable.
-    /// @param _maxDrawingTime The new value for the `maxDrawingTime` storage variable.
-    function changeMaxDrawingTime(uint256 _maxDrawingTime) external onlyByOwner {
-        maxDrawingTime = _maxDrawingTime;
-    }
-
-    /// @dev Changes the `rng` storage variable.
-    /// @param _rng The new random number generator.
-    function changeRandomNumberGenerator(IRNG _rng) external onlyByOwner {
-        rng = _rng;
-        if (phase == Phase.generating) {
-            rng.requestRandomness();
-        }
-    }
-
-    // ************************************* //
-    // *         State Modifiers           * //
-    // ************************************* //
-
-    function passPhase() external {
-        if (phase == Phase.staking) {
-            if (block.timestamp - lastPhaseChange < minStakingTime) revert MinStakingTimeNotPassed();
-            if (disputesWithoutJurors == 0) revert NoDisputesThatNeedJurors();
-            rng.requestRandomness();
-            phase = Phase.generating;
-        } else if (phase == Phase.generating) {
-            randomNumber = rng.receiveRandomness();
-            if (randomNumber == 0) revert RandomNumberNotReady();
-            phase = Phase.drawing;
-        } else if (phase == Phase.drawing) {
-            if (disputesWithoutJurors > 0 && block.timestamp - lastPhaseChange < maxDrawingTime) {
-                revert DisputesWithoutJurorsAndMaxDrawingTimeNotPassed();
-            }
-            phase = Phase.staking;
-        }
-
-        lastPhaseChange = block.timestamp;
-        emit NewPhase(phase);
-    }
-
-    /// @dev Create a sortition sum tree at the specified key.
-    /// @param _courtID The ID of the court.
-    /// @param _extraData Extra data that contains the number of children each node in the tree should have.
-    function createTree(uint96 _courtID, bytes memory _extraData) external override onlyByCore {
-        TreeKey key = CourtID.wrap(_courtID).toTreeKey();
-        uint256 K = _extraDataToTreeK(_extraData);
-        sortitionSumTrees.createTree(key, K);
-    }
-
-    /// @dev Executes the next delayed stakes.
-    /// @param _iterations The number of delayed stakes to execute.
-    function executeDelayedStakes(uint256 _iterations) external {
-        if (phase != Phase.staking) revert NotStakingPhase();
-        if (delayedStakeWriteIndex < delayedStakeReadIndex) revert NoDelayedStakeToExecute();
-
-        uint256 actualIterations = (delayedStakeReadIndex + _iterations) - 1 > delayedStakeWriteIndex
-            ? (delayedStakeWriteIndex - delayedStakeReadIndex) + 1
-            : _iterations;
-        uint256 newDelayedStakeReadIndex = delayedStakeReadIndex + actualIterations;
-
-        for (uint256 i = delayedStakeReadIndex; i < newDelayedStakeReadIndex; i++) {
-            DelayedStake storage delayedStake = delayedStakes[i];
-            core.setStakeBySortitionModule(delayedStake.account, delayedStake.courtID, delayedStake.stake);
-            delete delayedStakes[i];
-        }
-        delayedStakeReadIndex = newDelayedStakeReadIndex;
-    }
-
-    function createDisputeHook(uint256 /*_disputeID*/, uint256 /*_roundID*/) external override onlyByCore {
-        disputesWithoutJurors++;
-    }
-
-    function postDrawHook(uint256 /*_disputeID*/, uint256 /*_roundID*/) external override onlyByCore {
-        disputesWithoutJurors--;
-    }
-
-    /// @dev Saves the random number to use it in sortition. Not used by this contract because the storing of the number is inlined in passPhase().
-    /// @param _randomNumber Random number returned by RNG contract.
-    function notifyRandomNumber(uint256 _randomNumber) public override {}
-
-    /// @dev Validate the specified juror's new stake for a court.
-    /// Note: no state changes should be made when returning stakingResult != Successful, otherwise delayed stakes might break invariants.
-    /// @param _account The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @param _newStake The new stake.
-    /// @param _noDelay True if the stake change should not be delayed.
-    /// @return pnkDeposit The amount of PNK to be deposited.
-    /// @return pnkWithdrawal The amount of PNK to be withdrawn.
-    /// @return stakingResult The result of the staking operation.
-    function validateStake(
-        address _account,
-        uint96 _courtID,
-        uint256 _newStake,
-        bool _noDelay
-    ) external override onlyByCore returns (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) {
-        (pnkDeposit, pnkWithdrawal, stakingResult) = _validateStake(_account, _courtID, _newStake, _noDelay);
-    }
-
-    function _validateStake(
-        address _account,
-        uint96 _courtID,
-        uint256 _newStake,
-        bool _noDelay
-    ) internal virtual returns (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) {
-        Juror storage juror = jurors[_account];
-        uint256 currentStake = stakeOf(_account, _courtID);
-
-        uint256 nbCourts = juror.courtIDs.length;
-        if (currentStake == 0 && nbCourts >= MAX_STAKE_PATHS) {
-            return (0, 0, StakingResult.CannotStakeInMoreCourts); // Prevent staking beyond MAX_STAKE_PATHS but unstaking is always allowed.
-        }
-
-        if (currentStake == 0 && _newStake == 0) {
-            return (0, 0, StakingResult.CannotStakeZeroWhenNoStake); // Forbid staking 0 amount when current stake is 0 to avoid flaky behaviour.
-        }
-
-        if (phase != Phase.staking && !_noDelay) {
-            // Store the stake change as delayed, to be applied when the phase switches back to Staking.
-            DelayedStake storage delayedStake = delayedStakes[++delayedStakeWriteIndex];
-            delayedStake.account = _account;
-            delayedStake.courtID = _courtID;
-            delayedStake.stake = _newStake;
-            emit StakeDelayed(_account, _courtID, _newStake);
-            return (pnkDeposit, pnkWithdrawal, StakingResult.Delayed);
-        }
-
-        // Current phase is Staking: set stakes.
-        if (_newStake >= currentStake) {
-            pnkDeposit = _newStake - currentStake;
-        } else {
-            pnkWithdrawal = currentStake - _newStake;
-            // Ensure locked tokens remain in the contract. They can only be released during Execution.
-            uint256 possibleWithdrawal = juror.stakedPnk > juror.lockedPnk ? juror.stakedPnk - juror.lockedPnk : 0;
-            if (pnkWithdrawal > possibleWithdrawal) {
-                pnkWithdrawal = possibleWithdrawal;
-            }
-        }
-        return (pnkDeposit, pnkWithdrawal, StakingResult.Successful);
-    }
-
-    /// @dev Update the state of the stakes, called by KC at the end of setStake flow.
-    /// `O(n + p * log_k(j))` where
-    /// `n` is the number of courts the juror has staked in,
-    /// `p` is the depth of the court tree,
-    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
-    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
-    /// @param _account The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @param _pnkDeposit The amount of PNK to be deposited.
-    /// @param _pnkWithdrawal The amount of PNK to be withdrawn.
-    /// @param _newStake The new stake.
-    function setStake(
-        address _account,
-        uint96 _courtID,
-        uint256 _pnkDeposit,
-        uint256 _pnkWithdrawal,
-        uint256 _newStake
-    ) external override onlyByCore {
-        _setStake(_account, _courtID, _pnkDeposit, _pnkWithdrawal, _newStake);
-    }
-
-    /// @dev Update the state of the stakes with a PNK reward deposit, called by KC during rewards execution.
-    /// `O(n + p * log_k(j))` where
-    /// `n` is the number of courts the juror has staked in,
-    /// `p` is the depth of the court tree,
-    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
-    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
-    /// @param _account The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @param _penalty The amount of PNK to be deducted.
-    /// @return pnkBalance The updated total PNK balance of the juror, including the penalty.
-    /// @return newCourtStake The updated stake of the juror in the court.
-    /// @return availablePenalty The amount of PNK that was actually deducted.
-    function setStakePenalty(
-        address _account,
-        uint96 _courtID,
-        uint256 _penalty
-    ) external override onlyByCore returns (uint256 pnkBalance, uint256 newCourtStake, uint256 availablePenalty) {
-        Juror storage juror = jurors[_account];
-        availablePenalty = _penalty;
-        newCourtStake = stakeOf(_account, _courtID);
-        if (juror.stakedPnk < _penalty) {
-            availablePenalty = juror.stakedPnk;
-        }
-
-        if (availablePenalty == 0) return (juror.stakedPnk, newCourtStake, 0); // No penalty to apply.
-
-        uint256 currentStake = stakeOf(_account, _courtID);
-        uint256 newStake = 0;
-        if (currentStake >= availablePenalty) {
-            newStake = currentStake - availablePenalty;
-        }
-        _setStake(_account, _courtID, 0, availablePenalty, newStake);
-        pnkBalance = juror.stakedPnk; // updated by _setStake()
-        newCourtStake = stakeOf(_account, _courtID); // updated by _setStake()
-    }
-
-    /// @dev Update the state of the stakes with a PNK reward deposit, called by KC during rewards execution.
-    /// `O(n + p * log_k(j))` where
-    /// `n` is the number of courts the juror has staked in,
-    /// `p` is the depth of the court tree,
-    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
-    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
-    /// @param _account The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @param _reward The amount of PNK to be deposited as a reward.
-    function setStakeReward(
-        address _account,
-        uint96 _courtID,
-        uint256 _reward
-    ) external override onlyByCore returns (bool success) {
-        if (_reward == 0) return true; // No reward to add.
-
-        uint256 currentStake = stakeOf(_account, _courtID);
-        if (currentStake == 0) return false; // Juror has been unstaked, don't increase their stake.
-
-        uint256 newStake = currentStake + _reward;
-        _setStake(_account, _courtID, _reward, 0, newStake);
-        return true;
-    }
-
-    function _setStake(
-        address _account,
-        uint96 _courtID,
-        uint256 _pnkDeposit,
-        uint256 _pnkWithdrawal,
-        uint256 _newStake
-    ) internal virtual {
-        Juror storage juror = jurors[_account];
-        if (_pnkDeposit > 0) {
-            uint256 currentStake = stakeOf(_account, _courtID);
-            if (currentStake == 0) {
-                juror.courtIDs.push(_courtID);
-            }
-            // Increase juror's balance by deposited amount.
-            juror.stakedPnk += _pnkDeposit;
-        } else {
-            juror.stakedPnk -= _pnkWithdrawal;
-            if (_newStake == 0) {
-                // Cleanup
-                for (uint256 i = juror.courtIDs.length; i > 0; i--) {
-                    if (juror.courtIDs[i - 1] == _courtID) {
-                        juror.courtIDs[i - 1] = juror.courtIDs[juror.courtIDs.length - 1];
-                        juror.courtIDs.pop();
-                        break;
-                    }
-                }
-            }
-        }
-
-        // Update the sortition sum tree.
-        bytes32 stakePathID = SortitionTrees.toStakePathID(_account, _courtID);
-        bool finished = false;
-        uint96 currentCourtID = _courtID;
-        while (!finished) {
-            // Tokens are also implicitly staked in parent courts through sortition module to increase the chance of being drawn.
-            TreeKey key = CourtID.wrap(currentCourtID).toTreeKey();
-            sortitionSumTrees[key].set(_newStake, stakePathID);
-            if (currentCourtID == GENERAL_COURT) {
-                finished = true;
-            } else {
-                (currentCourtID, , , , , , ) = core.courts(currentCourtID); // Get the parent court.
-            }
-        }
-        emit StakeSet(_account, _courtID, _newStake, juror.stakedPnk);
-    }
-
-    function lockStake(address _account, uint256 _relativeAmount) external override onlyByCore {
-        jurors[_account].lockedPnk += _relativeAmount;
-        emit StakeLocked(_account, _relativeAmount, false);
-    }
-
-    function unlockStake(address _account, uint256 _relativeAmount) external override onlyByCore {
-        Juror storage juror = jurors[_account];
-        juror.lockedPnk -= _relativeAmount;
-        emit StakeLocked(_account, _relativeAmount, true);
-
-        uint256 amount = getJurorLeftoverPNK(_account);
-        if (amount > 0) {
-            emit LeftoverPNK(_account, amount);
-        }
-    }
-
-    /// @dev Unstakes the inactive juror from all courts.
-    /// `O(n * (p * log_k(j)) )` where
-    /// `n` is the number of courts the juror has staked in,
-    /// `p` is the depth of the court tree,
-    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
-    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
-    /// @param _account The juror to unstake.
-    function forcedUnstakeAllCourts(address _account) external override onlyByCore {
-        uint96[] memory courtIDs = getJurorCourtIDs(_account);
-        for (uint256 j = courtIDs.length; j > 0; j--) {
-            core.setStakeBySortitionModule(_account, courtIDs[j - 1], 0);
-        }
-    }
-
-    /// @dev Unstakes the inactive juror from a specific court.
-    /// `O(n * (p * log_k(j)) )` where
-    /// `n` is the number of courts the juror has staked in,
-    /// `p` is the depth of the court tree,
-    /// `k` is the minimum number of children per node of one of these courts' sortition sum tree,
-    /// and `j` is the maximum number of jurors that ever staked in one of these courts simultaneously.
-    /// @param _account The juror to unstake.
-    /// @param _courtID The ID of the court.
-    function forcedUnstake(address _account, uint96 _courtID) external override onlyByCore {
-        core.setStakeBySortitionModule(_account, _courtID, 0);
-    }
-
-    /// @dev Gives back the locked PNKs in case the juror fully unstaked earlier.
-    /// Note that since locked and staked PNK are async it is possible for the juror to have positive staked PNK balance
-    /// while having 0 stake in courts and 0 locked tokens (eg. when the juror fully unstaked during dispute and later got his tokens unlocked).
-    /// In this case the juror can use this function to withdraw the leftover tokens.
-    /// Also note that if the juror has some leftover PNK while not fully unstaked he'll have to manually unstake from all courts to trigger this function.
-    /// @param _account The juror whose PNK to withdraw.
-    function withdrawLeftoverPNK(address _account) external override {
-        // Can withdraw the leftover PNK if fully unstaked, has no tokens locked and has positive balance.
-        // This withdrawal can't be triggered by calling setStake() in KlerosCore because current stake is technically 0, thus it is done via separate function.
-        uint256 amount = getJurorLeftoverPNK(_account);
-        if (amount == 0) revert NotEligibleForWithdrawal();
-        jurors[_account].stakedPnk = 0;
-        core.transferBySortitionModule(_account, amount);
-        emit LeftoverPNKWithdrawn(_account, amount);
-    }
-
-    // ************************************* //
-    // *           Public Views            * //
-    // ************************************* //
-
-    /// @dev Draw an ID from a tree using a number.
-    /// Note that this function reverts if the sum of all values in the tree is 0.
-    /// @param _courtID The ID of the court.
-    /// @param _coreDisputeID Index of the dispute in Kleros Core.
-    /// @param _nonce Nonce to hash with random number.
-    /// @return drawnAddress The drawn address.
-    /// `O(k * log_k(n))` where
-    /// `k` is the maximum number of children per node in the tree,
-    ///  and `n` is the maximum number of nodes ever appended.
-    function draw(
-        uint96 _courtID,
-        uint256 _coreDisputeID,
-        uint256 _nonce
-    ) public view override returns (address drawnAddress, uint96 fromSubcourtID) {
-        if (phase != Phase.drawing) revert NotDrawingPhase();
-
-        TreeKey key = CourtID.wrap(_courtID).toTreeKey();
-        (drawnAddress, fromSubcourtID) = sortitionSumTrees[key].draw(_coreDisputeID, _nonce, randomNumber);
-    }
-
-    /// @dev Get the stake of a juror in a court.
-    /// @param _juror The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @return value The stake of the juror in the court.
-    function stakeOf(address _juror, uint96 _courtID) public view returns (uint256) {
-        bytes32 stakePathID = SortitionTrees.toStakePathID(_juror, _courtID);
-        TreeKey key = CourtID.wrap(_courtID).toTreeKey();
-        return sortitionSumTrees[key].stakeOf(stakePathID);
-    }
-
-    /// @dev Gets the balance of a juror in a court.
-    /// @param _juror The address of the juror.
-    /// @param _courtID The ID of the court.
-    /// @return totalStaked The total amount of tokens staked including locked tokens and penalty deductions. Equivalent to the effective stake in the General court.
-    /// @return totalLocked The total amount of tokens locked in disputes.
-    /// @return stakedInCourt The amount of tokens staked in the specified court including locked tokens and penalty deductions.
-    /// @return nbCourts The number of courts the juror has directly staked in.
-    function getJurorBalance(
-        address _juror,
-        uint96 _courtID
-    )
-        external
-        view
-        override
-        returns (uint256 totalStaked, uint256 totalLocked, uint256 stakedInCourt, uint256 nbCourts)
-    {
-        Juror storage juror = jurors[_juror];
-        totalStaked = juror.stakedPnk;
-        totalLocked = juror.lockedPnk;
-        stakedInCourt = stakeOf(_juror, _courtID);
-        nbCourts = juror.courtIDs.length;
-    }
-
-    /// @dev Gets the court identifiers where a specific `_juror` has staked.
-    /// @param _juror The address of the juror.
-    function getJurorCourtIDs(address _juror) public view override returns (uint96[] memory) {
-        return jurors[_juror].courtIDs;
-    }
-
-    function isJurorStaked(address _juror) external view override returns (bool) {
-        return jurors[_juror].stakedPnk > 0;
-    }
-
-    function getJurorLeftoverPNK(address _juror) public view override returns (uint256) {
-        Juror storage juror = jurors[_juror];
-        if (juror.courtIDs.length == 0 && juror.lockedPnk == 0) {
-            return juror.stakedPnk;
-        } else {
-            return 0;
-        }
-    }
-
-    // ************************************* //
-    // *            Internal               * //
-    // ************************************* //
-
-    function _extraDataToTreeK(bytes memory _extraData) internal pure returns (uint256 K) {
-        if (_extraData.length >= 32) {
-            assembly {
-                // solium-disable-line security/no-inline-assembly
-                K := mload(add(_extraData, 0x20))
-            }
-        } else {
-            K = DEFAULT_K;
-        }
-    }
-
-    // ************************************* //
-    // *              Errors               * //
-    // ************************************* //
-
-    error OwnerOnly();
-    error KlerosCoreOnly();
-    error MinStakingTimeNotPassed();
-    error NoDisputesThatNeedJurors();
-    error RandomNumberNotReady();
-    error DisputesWithoutJurorsAndMaxDrawingTimeNotPassed();
-    error NotStakingPhase();
-    error NoDelayedStakeToExecute();
-    error NotEligibleForWithdrawal();
-    error NotDrawingPhase();
-}
diff --git a/contracts/src/arbitration/SortitionModuleNeo.sol b/contracts/src/arbitration/SortitionModuleNeo.sol
deleted file mode 100644
index 66dbba7e5..000000000
--- a/contracts/src/arbitration/SortitionModuleNeo.sol
+++ /dev/null
@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.24;
-
-import {SortitionModuleBase, KlerosCore, IRNG, StakingResult} from "./SortitionModuleBase.sol";
-
-/// @title SortitionModuleNeo
-/// @dev A factory of trees that keeps track of staked values for sortition.
-contract SortitionModuleNeo is SortitionModuleBase {
-    string public constant override version = "2.0.0";
-
-    // ************************************* //
-    // *             Storage               * //
-    // ************************************* //
-
-    uint256 public maxStakePerJuror;
-    uint256 public maxTotalStaked;
-    uint256 public totalStaked;
-
-    // ************************************* //
-    // *            Constructor            * //
-    // ************************************* //
-
-    /// @custom:oz-upgrades-unsafe-allow constructor
-    constructor() {
-        _disableInitializers();
-    }
-
-    /// @dev Initializer (constructor equivalent for upgradable contracts).
-    /// @param _owner The owner.
-    /// @param _core The KlerosCore.
-    /// @param _minStakingTime Minimal time to stake
-    /// @param _maxDrawingTime Time after which the drawing phase can be switched
-    /// @param _rng The random number generator.
-    /// @param _maxStakePerJuror The maximum amount of PNK a juror can stake in a court.
-    /// @param _maxTotalStaked The maximum amount of PNK that can be staked in all courts.
-    function initialize(
-        address _owner,
-        KlerosCore _core,
-        uint256 _minStakingTime,
-        uint256 _maxDrawingTime,
-        IRNG _rng,
-        uint256 _maxStakePerJuror,
-        uint256 _maxTotalStaked
-    ) external reinitializer(2) {
-        __SortitionModuleBase_initialize(_owner, _core, _minStakingTime, _maxDrawingTime, _rng);
-        maxStakePerJuror = _maxStakePerJuror;
-        maxTotalStaked = _maxTotalStaked;
-    }
-
-    // ************************************* //
-    // *             Governance            * //
-    // ************************************* //
-
-    /// @dev Access Control to perform implementation upgrades (UUPS Proxiable)
-    ///      Only the owner can perform upgrades (`onlyByOwner`)
-    function _authorizeUpgrade(address) internal view override onlyByOwner {
-        // NOP
-    }
-
-    function changeMaxStakePerJuror(uint256 _maxStakePerJuror) external onlyByOwner {
-        maxStakePerJuror = _maxStakePerJuror;
-    }
-
-    function changeMaxTotalStaked(uint256 _maxTotalStaked) external onlyByOwner {
-        maxTotalStaked = _maxTotalStaked;
-    }
-
-    // ************************************* //
-    // *         State Modifiers           * //
-    // ************************************* //
-
-    function _validateStake(
-        address _account,
-        uint96 _courtID,
-        uint256 _newStake,
-        bool _noDelay
-    ) internal override onlyByCore returns (uint256 pnkDeposit, uint256 pnkWithdrawal, StakingResult stakingResult) {
-        uint256 currentStake = stakeOf(_account, _courtID);
-        bool stakeIncrease = _newStake > currentStake;
-        uint256 stakeChange = stakeIncrease ? _newStake - currentStake : currentStake - _newStake;
-        Juror storage juror = jurors[_account];
-        if (stakeIncrease) {
-            if (juror.stakedPnk + stakeChange > maxStakePerJuror || currentStake + stakeChange > maxStakePerJuror) {
-                return (0, 0, StakingResult.CannotStakeMoreThanMaxStakePerJuror);
-            }
-            if (totalStaked + stakeChange > maxTotalStaked) {
-                return (0, 0, StakingResult.CannotStakeMoreThanMaxTotalStaked);
-            }
-        }
-        if (phase == Phase.staking) {
-            if (stakeIncrease) {
-                totalStaked += stakeChange;
-            } else {
-                totalStaked -= stakeChange;
-            }
-        }
-        (pnkDeposit, pnkWithdrawal, stakingResult) = super._validateStake(_account, _courtID, _newStake, _noDelay);
-    }
-}
diff --git a/contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol b/contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol
index 369789ab1..5dc1c3522 100644
--- a/contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol
+++ b/contracts/src/arbitration/dispute-kits/DisputeKitClassicBase.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.24;
 
-import {KlerosCore, KlerosCoreBase, IDisputeKit, ISortitionModule} from "../KlerosCore.sol";
+import {KlerosCore, IDisputeKit, ISortitionModule} from "../KlerosCore.sol";
 import {Initializable} from "../../proxy/Initializable.sol";
 import {UUPSProxiable} from "../../proxy/UUPSProxiable.sol";
 import {SafeSend} from "../../libraries/SafeSend.sol";
@@ -273,7 +273,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         bytes32 _commit
     ) internal notJumped(_coreDisputeID) {
         (, , KlerosCore.Period period, , ) = core.disputes(_coreDisputeID);
-        if (period != KlerosCoreBase.Period.commit) revert NotCommitPeriod();
+        if (period != KlerosCore.Period.commit) revert NotCommitPeriod();
         if (_commit == bytes32(0)) revert EmptyCommit();
         if (!coreDisputeIDToActive[_coreDisputeID]) revert NotActiveForCoreDisputeID();
 
@@ -314,7 +314,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         address _juror
     ) internal notJumped(_coreDisputeID) {
         (, , KlerosCore.Period period, , ) = core.disputes(_coreDisputeID);
-        if (period != KlerosCoreBase.Period.vote) revert NotVotePeriod();
+        if (period != KlerosCore.Period.vote) revert NotVotePeriod();
         if (_voteIDs.length == 0) revert EmptyVoteIDs();
         if (!coreDisputeIDToActive[_coreDisputeID]) revert NotActiveForCoreDisputeID();
 
@@ -517,7 +517,7 @@ abstract contract DisputeKitClassicBase is IDisputeKit, Initializable, UUPSProxi
         ruling = tied ? 0 : round.winningChoice;
         (, , KlerosCore.Period period, , ) = core.disputes(_coreDisputeID);
         // Override the final ruling if only one side funded the appeals.
-        if (period == KlerosCoreBase.Period.execution) {
+        if (period == KlerosCore.Period.execution) {
             uint256[] memory fundedChoices = getFundedChoices(_coreDisputeID);
             if (fundedChoices.length == 1) {
                 ruling = fundedChoices[0];
diff --git a/contracts/src/proxy/KlerosProxies.sol b/contracts/src/proxy/KlerosProxies.sol
index 57b521ffd..7db79b67c 100644
--- a/contracts/src/proxy/KlerosProxies.sol
+++ b/contracts/src/proxy/KlerosProxies.sol
@@ -7,10 +7,6 @@ import "./UUPSProxy.sol";
 /// Workaround to get meaningful names for the proxy contracts
 /// Otherwise all the contracts are called `UUPSProxy` on the chain explorers
 
-contract DisputeKitClassicNeoProxy is UUPSProxy {
-    constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
-}
-
 contract DisputeKitClassicUniversityProxy is UUPSProxy {
     constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
 }
@@ -51,10 +47,6 @@ contract HomeGatewayToEthereumProxy is UUPSProxy {
     constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
 }
 
-contract KlerosCoreNeoProxy is UUPSProxy {
-    constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
-}
-
 contract KlerosCoreRulerProxy is UUPSProxy {
     constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
 }
@@ -75,10 +67,6 @@ contract RandomizerRNGProxy is UUPSProxy {
     constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
 }
 
-contract SortitionModuleNeoProxy is UUPSProxy {
-    constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
-}
-
 contract SortitionModuleUniversityProxy is UUPSProxy {
     constructor(address _implementation, bytes memory _data) UUPSProxy(_implementation, _data) {}
 }
diff --git a/contracts/test/arbitration/staking-neo.ts b/contracts/test/arbitration/staking-neo.ts
index 5537742a6..9cd83efeb 100644
--- a/contracts/test/arbitration/staking-neo.ts
+++ b/contracts/test/arbitration/staking-neo.ts
@@ -3,8 +3,8 @@ import {
   PNK,
   RandomizerRNG,
   RandomizerMock,
-  SortitionModuleNeo,
-  KlerosCoreNeo,
+  SortitionModule,
+  KlerosCore,
   TestERC721,
   DisputeResolver,
   ChainlinkRNG,
@@ -41,8 +41,8 @@ describe("Staking", async () => {
   let juror: HardhatEthersSigner;
   let guardian: HardhatEthersSigner;
   let pnk: PNK;
-  let core: KlerosCoreNeo;
-  let sortition: SortitionModuleNeo;
+  let core: KlerosCore;
+  let sortition: SortitionModule;
   let rng: ChainlinkRNG;
   let vrfCoordinator: ChainlinkVRFCoordinatorV2Mock;
   let nft: TestERC721;
@@ -52,16 +52,16 @@ describe("Staking", async () => {
   const deployUnhappy = async () => {
     ({ deployer } = await getNamedAccounts());
 
-    await deployments.fixture(["ArbitrationNeo"], {
+    await deployments.fixture(["ArbitrationMainnet"], {
       fallbackToGlobal: true,
       keepExistingDeployments: false,
     });
     pnk = await ethers.getContract<PNK>("PNK");
-    core = await ethers.getContract<KlerosCoreNeo>("KlerosCoreNeo");
-    sortition = await ethers.getContract<SortitionModuleNeo>("SortitionModuleNeo");
+    core = await ethers.getContract<KlerosCore>("KlerosCore");
+    sortition = await ethers.getContract<SortitionModule>("SortitionModule");
     rng = await ethers.getContract<ChainlinkRNG>("ChainlinkRNG");
     vrfCoordinator = await ethers.getContract<ChainlinkVRFCoordinatorV2Mock>("ChainlinkVRFCoordinator");
-    resolver = await ethers.getContract<DisputeResolver>("DisputeResolverNeo");
+    resolver = await ethers.getContract<DisputeResolver>("DisputeResolver");
     nft = await ethers.getContract<TestERC721>("KlerosV2NeoEarlyUser");
 
     // Juror signer setup and funding
@@ -128,60 +128,98 @@ describe("Staking", async () => {
     SHOULD BEHAVE LIKE A NEO ARBITRATOR
   ************************************************************************************************/
 
-  describe("When arbitrable is not whitelisted", () => {
+  describe("When arbitrable whitelist is disabled", () => {
     before("Setup", async () => {
       await deployUnhappy();
-      await core.changeArbitrableWhitelist(resolver.target, false);
+      await core.changeArbitrableWhitelistEnabled(false);
     });
 
-    it("Should fail to create a dispute", async () => {
+    it("Should create a dispute", async () => {
       const arbitrationCost = ETH(0.5);
-      await expect(
-        resolver.createDisputeForTemplate(extraData, "", "", 2, { value: arbitrationCost })
-      ).to.be.revertedWithCustomError(core, "ArbitrableNotWhitelisted");
+      expect(await resolver.createDisputeForTemplate(extraData, "", "", 2, { value: arbitrationCost }))
+        .to.emit(core, "DisputeCreation")
+        .withArgs(0, resolver.target);
     });
   });
 
-  describe("When arbitrable is whitelisted", () => {
+  describe("When arbitrable whitelist is enabled", () => {
     before("Setup", async () => {
       await deployUnhappy();
-      await core.changeArbitrableWhitelist(resolver.target, true);
+      await core.changeArbitrableWhitelistEnabled(true);
     });
 
-    it("Should create a dispute", async () => {
-      const arbitrationCost = ETH(0.5);
-      expect(await resolver.createDisputeForTemplate(extraData, "", "", 2, { value: arbitrationCost }))
-        .to.emit(core, "DisputeCreation")
-        .withArgs(0, resolver.target);
+    describe("When arbitrable is not whitelisted", () => {
+      before("Setup", async () => {
+        await core.changeArbitrableWhitelist(resolver.target, false);
+      });
+
+      it("Should fail to create a dispute", async () => {
+        const arbitrationCost = ETH(0.5);
+        await expect(
+          resolver.createDisputeForTemplate(extraData, "", "", 2, { value: arbitrationCost })
+        ).to.be.revertedWithCustomError(core, "ArbitrableNotWhitelisted");
+      });
+    });
+
+    describe("When arbitrable is whitelisted", () => {
+      before("Setup", async () => {
+        await core.changeArbitrableWhitelist(resolver.target, true);
+      });
+
+      it("Should create a dispute", async () => {
+        const arbitrationCost = ETH(0.5);
+        expect(await resolver.createDisputeForTemplate(extraData, "", "", 2, { value: arbitrationCost }))
+          .to.emit(core, "DisputeCreation")
+          .withArgs(0, resolver.target);
+      });
     });
   });
 
-  describe("When juror has no NFT", async () => {
+  describe("When juror NFT is not set", async () => {
     before("Setup", async () => {
       await deployUnhappy();
+      await core.changeJurorNft(ethers.ZeroAddress);
     });
 
-    it("Should not be able to stake", async () => {
-      await pnk.connect(juror).approve(core.target, PNK(1000));
-      await expect(core.connect(juror).setStake(1, PNK(1000))).to.be.revertedWithCustomError(
-        core,
-        "NotEligibleForStaking"
-      );
+    describe("When juror has no NFT", async () => {
+      it("Should be able to stake", async () => {
+        await pnk.connect(juror).approve(core.target, PNK(1000));
+        await expect(await core.connect(juror).setStake(1, PNK(1000)))
+          .to.emit(sortition, "StakeSet")
+          .withArgs(juror.address, 1, PNK(1000), PNK(1000));
+        expect(await sortition.totalStaked()).to.be.equal(PNK(1000));
+      });
     });
   });
 
-  describe("When juror does have a NFT", async () => {
-    before("Setup", async () => {
-      await deployUnhappy();
-      await nft.safeMint(juror.address);
+  describe("When juror NFT is set", async () => {
+    describe("When juror has no NFT", async () => {
+      before("Setup", async () => {
+        await deployUnhappy();
+      });
+
+      it("Should not be able to stake", async () => {
+        await pnk.connect(juror).approve(core.target, PNK(1000));
+        await expect(core.connect(juror).setStake(1, PNK(1000))).to.be.revertedWithCustomError(
+          core,
+          "NotEligibleForStaking"
+        );
+      });
     });
 
-    it("Should be able to stake", async () => {
-      await pnk.connect(juror).approve(core.target, PNK(1000));
-      await expect(await core.connect(juror).setStake(1, PNK(1000)))
-        .to.emit(sortition, "StakeSet")
-        .withArgs(juror.address, 1, PNK(1000), PNK(1000));
-      expect(await sortition.totalStaked()).to.be.equal(PNK(1000));
+    describe("When juror does have a NFT", async () => {
+      before("Setup", async () => {
+        await deployUnhappy();
+        await nft.safeMint(juror.address);
+      });
+
+      it("Should be able to stake", async () => {
+        await pnk.connect(juror).approve(core.target, PNK(1000));
+        await expect(await core.connect(juror).setStake(1, PNK(1000)))
+          .to.emit(sortition, "StakeSet")
+          .withArgs(juror.address, 1, PNK(1000), PNK(1000));
+        expect(await sortition.totalStaked()).to.be.equal(PNK(1000));
+      });
     });
   });
 
diff --git a/contracts/test/foundry/KlerosCore_Appeals.t.sol b/contracts/test/foundry/KlerosCore_Appeals.t.sol
index 6421cb119..c5016f23c 100644
--- a/contracts/test/foundry/KlerosCore_Appeals.t.sol
+++ b/contracts/test/foundry/KlerosCore_Appeals.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
 import {DisputeKitClassic, DisputeKitClassicBase} from "../../src/arbitration/dispute-kits/DisputeKitClassic.sol";
 import {UUPSProxy} from "../../src/proxy/UUPSProxy.sol";
 import "../../src/libraries/Constants.sol";
@@ -42,34 +42,34 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
 
         // Simulate the call from dispute kit to check the requires unrelated to caller
         vm.prank(address(disputeKit));
-        vm.expectRevert(KlerosCoreBase.DisputeNotAppealable.selector);
+        vm.expectRevert(KlerosCore.DisputeNotAppealable.selector);
         core.appeal{value: 0.21 ether}(disputeID, 2, arbitratorExtraData);
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.AppealPossible(disputeID, arbitrable);
+        emit KlerosCore.AppealPossible(disputeID, arbitrable);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.appeal);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.appeal);
         core.passPeriod(disputeID);
 
-        (, , KlerosCoreBase.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
+        (, , KlerosCore.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
         (start, end) = core.appealPeriod(0);
-        assertEq(uint256(period), uint256(KlerosCoreBase.Period.appeal), "Wrong period");
+        assertEq(uint256(period), uint256(KlerosCore.Period.appeal), "Wrong period");
         assertEq(lastPeriodChange, block.timestamp, "Wrong lastPeriodChange");
         assertEq(core.appealCost(0), 0.21 ether, "Wrong appealCost");
         assertEq(start, lastPeriodChange, "Appeal period start is incorrect");
         assertEq(end, lastPeriodChange + timesPerPeriod[3], "Appeal period end is incorrect");
 
-        vm.expectRevert(KlerosCoreBase.AppealPeriodNotPassed.selector);
+        vm.expectRevert(KlerosCore.AppealPeriodNotPassed.selector);
         core.passPeriod(disputeID);
 
         // Simulate the call from dispute kit to check the requires unrelated to caller
         vm.prank(address(disputeKit));
-        vm.expectRevert(KlerosCoreBase.AppealFeesNotEnough.selector);
+        vm.expectRevert(KlerosCore.AppealFeesNotEnough.selector);
         core.appeal{value: 0.21 ether - 1}(disputeID, 2, arbitratorExtraData);
         vm.deal(address(disputeKit), 0); // Nullify the balance so it doesn't get in the way.
 
         vm.prank(staker1);
-        vm.expectRevert(KlerosCoreBase.DisputeKitOnly.selector);
+        vm.expectRevert(KlerosCore.DisputeKitOnly.selector);
         core.appeal{value: 0.21 ether}(disputeID, 2, arbitratorExtraData);
 
         vm.prank(crowdfunder1);
@@ -177,9 +177,9 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
 
         vm.prank(crowdfunder2);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.AppealDecision(disputeID, arbitrable);
+        emit KlerosCore.AppealDecision(disputeID, arbitrable);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.evidence);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.evidence);
         disputeKit.fundAppeal{value: 0.42 ether}(disputeID, 2);
 
         assertEq((disputeKit.getFundedChoices(disputeID)).length, 0, "No funded choices in the fresh round");
@@ -194,17 +194,17 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
         assertEq(sortitionModule.disputesWithoutJurors(), 1, "Wrong disputesWithoutJurors count after appeal");
         assertEq(core.getNumberOfRounds(disputeID), 2, "Wrong number of rounds");
 
-        (, , KlerosCoreBase.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
-        assertEq(uint256(period), uint256(KlerosCoreBase.Period.evidence), "Wrong period");
+        (, , KlerosCore.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
+        assertEq(uint256(period), uint256(KlerosCore.Period.evidence), "Wrong period");
         assertEq(lastPeriodChange, block.timestamp, "Wrong lastPeriodChange");
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 1); // Check the new round
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 1); // Check the new round
         assertEq(round.pnkAtStakePerJuror, 1000, "Wrong pnkAtStakePerJuror");
         assertEq(round.totalFeesForJurors, 0.21 ether, "Wrong totalFeesForJurors");
         assertEq(round.nbVotes, 7, "Wrong nbVotes");
 
         core.draw(disputeID, 7);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.vote); // Check that we don't have to wait for the timeout to pass the evidence period after appeal
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.vote); // Check that we don't have to wait for the timeout to pass the evidence period after appeal
         core.passPeriod(disputeID);
     }
 
@@ -263,7 +263,7 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
         vm.warp(block.timestamp + rngLookahead);
         sortitionModule.passPhase(); // Drawing phase
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.disputeKitID, newDkID, "Wrong DK ID");
 
         core.draw(disputeID, DEFAULT_NB_OF_JURORS);
@@ -286,15 +286,15 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
         assertEq(core.isDisputeKitJumping(disputeID), true, "Should be jumping");
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.CourtJump(disputeID, 1, newCourtID, GENERAL_COURT);
+        emit KlerosCore.CourtJump(disputeID, 1, newCourtID, GENERAL_COURT);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitJump(disputeID, 1, newDkID, DISPUTE_KIT_CLASSIC);
+        emit KlerosCore.DisputeKitJump(disputeID, 1, newDkID, DISPUTE_KIT_CLASSIC);
         vm.expectEmit(true, true, true, true);
         emit DisputeKitClassicBase.DisputeCreation(disputeID, 2, newExtraData);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.AppealDecision(disputeID, arbitrable);
+        emit KlerosCore.AppealDecision(disputeID, arbitrable);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.evidence);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.evidence);
         vm.prank(crowdfunder2);
         newDisputeKit.fundAppeal{value: 0.42 ether}(disputeID, 2);
 
@@ -322,7 +322,7 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
 
         // And check that draw in the new round works
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Draw(staker1, disputeID, 1, 0); // roundID = 1 VoteID = 0
+        emit KlerosCore.Draw(staker1, disputeID, 1, 0); // roundID = 1 VoteID = 0
         core.draw(disputeID, 1);
 
         (address account, , , ) = disputeKit.getVoteInfo(disputeID, 1, 0);
@@ -401,7 +401,7 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
         vm.warp(block.timestamp + rngLookahead);
         sortitionModule.passPhase(); // Drawing phase
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.disputeKitID, dkID3, "Wrong DK ID");
 
         core.draw(disputeID, DEFAULT_NB_OF_JURORS);
@@ -424,15 +424,15 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
         assertEq(core.isDisputeKitJumping(disputeID), true, "Should be jumping");
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.CourtJump(disputeID, 1, newCourtID, GENERAL_COURT);
+        emit KlerosCore.CourtJump(disputeID, 1, newCourtID, GENERAL_COURT);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitJump(disputeID, 1, dkID3, dkID2);
+        emit KlerosCore.DisputeKitJump(disputeID, 1, dkID3, dkID2);
         vm.expectEmit(true, true, true, true);
         emit DisputeKitClassicBase.DisputeCreation(disputeID, 2, newExtraData);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.AppealDecision(disputeID, arbitrable);
+        emit KlerosCore.AppealDecision(disputeID, arbitrable);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.evidence);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.evidence);
         vm.prank(crowdfunder2);
         disputeKit3.fundAppeal{value: 0.42 ether}(disputeID, 2);
 
@@ -460,7 +460,7 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
 
         // And check that draw in the new round works
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Draw(staker1, disputeID, 1, 0); // roundID = 1 VoteID = 0
+        emit KlerosCore.Draw(staker1, disputeID, 1, 0); // roundID = 1 VoteID = 0
         core.draw(disputeID, 1);
 
         (address account, , , ) = disputeKit2.getVoteInfo(disputeID, 1, 0);
@@ -497,7 +497,7 @@ contract KlerosCore_AppealsTest is KlerosCore_TestBase {
 
         // Should pass to execution period without waiting for the 2nd half of the appeal.
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.execution);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.execution);
         core.passPeriod(disputeID);
     }
 }
diff --git a/contracts/test/foundry/KlerosCore_Disputes.t.sol b/contracts/test/foundry/KlerosCore_Disputes.t.sol
index 954789f92..f9840014d 100644
--- a/contracts/test/foundry/KlerosCore_Disputes.t.sol
+++ b/contracts/test/foundry/KlerosCore_Disputes.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
-import {IArbitratorV2} from "../../src/arbitration/KlerosCoreBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
+import {IArbitratorV2} from "../../src/arbitration/KlerosCore.sol";
 import {DisputeKitClassicBase} from "../../src/arbitration/dispute-kits/DisputeKitClassicBase.sol";
 import {IArbitrableV2} from "../../src/arbitration/arbitrables/ArbitrableExample.sol";
 import "../../src/libraries/Constants.sol";
@@ -38,11 +38,11 @@ contract KlerosCore_DisputesTest is KlerosCore_TestBase {
 
         arbitrable.changeArbitratorExtraData(newExtraData);
 
-        vm.expectRevert(KlerosCoreBase.ArbitrationFeesNotEnough.selector);
+        vm.expectRevert(KlerosCore.ArbitrationFeesNotEnough.selector);
         vm.prank(disputer);
         arbitrable.createDispute{value: newFee * newNbJurors - 1}("Action");
 
-        vm.expectRevert(KlerosCoreBase.DisputeKitNotSupportedByCourt.selector);
+        vm.expectRevert(KlerosCore.DisputeKitNotSupportedByCourt.selector);
         vm.prank(disputer);
         arbitrable.createDispute{value: 0.04 ether}("Action");
 
@@ -64,18 +64,18 @@ contract KlerosCore_DisputesTest is KlerosCore_TestBase {
         (
             uint96 courtID,
             IArbitrableV2 arbitrated,
-            KlerosCoreBase.Period period,
+            KlerosCore.Period period,
             bool ruled,
             uint256 lastPeriodChange
         ) = core.disputes(disputeID);
 
         assertEq(courtID, newCourtID, "Wrong court ID");
         assertEq(address(arbitrated), address(arbitrable), "Wrong arbitrable");
-        assertEq(uint256(period), uint256(KlerosCoreBase.Period.evidence), "Wrong period");
+        assertEq(uint256(period), uint256(KlerosCore.Period.evidence), "Wrong period");
         assertEq(ruled, false, "Should not be ruled");
         assertEq(lastPeriodChange, block.timestamp, "Wrong lastPeriodChange");
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.disputeKitID, newDkID, "Wrong DK ID");
         assertEq(round.pnkAtStakePerJuror, 4000, "Wrong pnkAtStakePerJuror"); // minStake * alpha / divisor = 2000 * 20000/10000
         assertEq(round.totalFeesForJurors, 0.04 ether, "Wrong totalFeesForJurors");
@@ -116,7 +116,7 @@ contract KlerosCore_DisputesTest is KlerosCore_TestBase {
         vm.prank(disputer);
         feeToken.approve(address(arbitrable), 1 ether);
 
-        vm.expectRevert(KlerosCoreBase.TokenNotAccepted.selector);
+        vm.expectRevert(KlerosCore.TokenNotAccepted.selector);
         vm.prank(disputer);
         arbitrable.createDispute("Action", 0.18 ether);
 
@@ -125,11 +125,11 @@ contract KlerosCore_DisputesTest is KlerosCore_TestBase {
         vm.prank(owner);
         core.changeCurrencyRates(feeToken, 500, 3);
 
-        vm.expectRevert(KlerosCoreBase.ArbitrationFeesNotEnough.selector);
+        vm.expectRevert(KlerosCore.ArbitrationFeesNotEnough.selector);
         vm.prank(disputer);
         arbitrable.createDispute("Action", 0.18 ether - 1);
 
-        vm.expectRevert(KlerosCoreBase.TransferFailed.selector);
+        vm.expectRevert(KlerosCore.TransferFailed.selector);
         vm.prank(address(arbitrable)); // Bypass createDispute in arbitrable to avoid transfer checks there and make the arbitrable call KC directly
         core.createDispute(2, arbitratorExtraData, feeToken, 0.18 ether);
 
@@ -137,7 +137,7 @@ contract KlerosCore_DisputesTest is KlerosCore_TestBase {
         vm.prank(disputer);
         arbitrable.createDispute("Action", 0.18 ether);
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(0, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(0, 0);
         assertEq(round.totalFeesForJurors, 0.18 ether, "Wrong totalFeesForJurors");
         assertEq(round.nbVotes, 3, "Wrong nbVotes");
         assertEq(address(round.feeToken), address(feeToken), "Wrong feeToken");
diff --git a/contracts/test/foundry/KlerosCore_Drawing.t.sol b/contracts/test/foundry/KlerosCore_Drawing.t.sol
index d6ffc9ea9..9bffbc27d 100644
--- a/contracts/test/foundry/KlerosCore_Drawing.t.sol
+++ b/contracts/test/foundry/KlerosCore_Drawing.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
-import {SortitionModuleBase} from "../../src/arbitration/SortitionModuleBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
+import {SortitionModule} from "../../src/arbitration/SortitionModule.sol";
 import {ISortitionModule} from "../../src/arbitration/interfaces/ISortitionModule.sol";
 import "../../src/libraries/Constants.sol";
 
@@ -24,9 +24,9 @@ contract KlerosCore_DrawingTest is KlerosCore_TestBase {
         sortitionModule.passPhase(); // Drawing phase
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker1, 1000, false);
+        emit SortitionModule.StakeLocked(staker1, 1000, false);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Draw(staker1, disputeID, roundID, 0); // VoteID = 0
+        emit KlerosCore.Draw(staker1, disputeID, roundID, 0); // VoteID = 0
 
         core.draw(disputeID, DEFAULT_NB_OF_JURORS); // Do 3 iterations and see that the juror will get drawn 3 times despite low stake.
 
@@ -61,7 +61,7 @@ contract KlerosCore_DrawingTest is KlerosCore_TestBase {
 
         core.draw(disputeID, DEFAULT_NB_OF_JURORS); // No one is staked so check that the empty addresses are not drawn.
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, roundID);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, roundID);
         assertEq(round.drawIterations, 3, "Wrong drawIterations number");
 
         (, , , , uint256 nbVoters, ) = disputeKit.getRoundInfo(disputeID, roundID, 0);
@@ -106,16 +106,16 @@ contract KlerosCore_DrawingTest is KlerosCore_TestBase {
         assertEq(courtID, GENERAL_COURT, "Wrong court ID of the dispute");
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Draw(staker1, disputeID, roundID, 0);
+        emit KlerosCore.Draw(staker1, disputeID, roundID, 0);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Draw(staker1, disputeID, roundID, 1);
+        emit KlerosCore.Draw(staker1, disputeID, roundID, 1);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Draw(staker1, disputeID, roundID, 2);
+        emit KlerosCore.Draw(staker1, disputeID, roundID, 2);
         core.draw(disputeID, DEFAULT_NB_OF_JURORS);
 
         assertEq(sortitionModule.disputesWithoutJurors(), 0, "Wrong disputesWithoutJurors count");
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, roundID);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, roundID);
         assertEq(round.drawIterations, 3, "Wrong drawIterations number");
 
         (, , , , uint256 nbVoters, ) = disputeKit.getRoundInfo(disputeID, roundID, 0);
diff --git a/contracts/test/foundry/KlerosCore_Execution.t.sol b/contracts/test/foundry/KlerosCore_Execution.t.sol
index c5763964e..01efd6409 100644
--- a/contracts/test/foundry/KlerosCore_Execution.t.sol
+++ b/contracts/test/foundry/KlerosCore_Execution.t.sol
@@ -2,10 +2,10 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
-import {SortitionModuleBase} from "../../src/arbitration/SortitionModuleBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
+import {SortitionModule} from "../../src/arbitration/SortitionModule.sol";
 import {DisputeKitClassicBase} from "../../src/arbitration/dispute-kits/DisputeKitClassicBase.sol";
-import {IArbitratorV2, IArbitrableV2} from "../../src/arbitration/KlerosCoreBase.sol";
+import {IArbitratorV2, IArbitrableV2} from "../../src/arbitration/KlerosCore.sol";
 import {IERC20} from "../../src/libraries/SafeERC20.sol";
 import "../../src/libraries/Constants.sol";
 
@@ -53,7 +53,7 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         disputeKit.castVote(disputeID, voteIDs, 2, 0, "XYZ");
         core.passPeriod(disputeID); // Appeal
 
-        vm.expectRevert(KlerosCoreBase.NotExecutionPeriod.selector);
+        vm.expectRevert(KlerosCore.NotExecutionPeriod.selector);
         core.execute(disputeID, 0, 1);
 
         vm.warp(block.timestamp + timesPerPeriod[3]);
@@ -61,7 +61,7 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
 
         vm.prank(owner);
         core.pause();
-        vm.expectRevert(KlerosCoreBase.WhenNotPausedOnly.selector);
+        vm.expectRevert(KlerosCore.WhenNotPausedOnly.selector);
         core.execute(disputeID, 0, 1);
         vm.prank(owner);
         core.unpause();
@@ -96,18 +96,18 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         );
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker1, 1000, true);
+        emit SortitionModule.StakeLocked(staker1, 1000, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker1, disputeID, 0, 0, -int256(1000), 0, IERC20(address(0)));
+        emit KlerosCore.TokenAndETHShift(staker1, disputeID, 0, 0, -int256(1000), 0, IERC20(address(0)));
         // Check iterations for the winning staker to see the shifts
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker2, 0, true);
+        emit SortitionModule.StakeLocked(staker2, 0, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker2, disputeID, 0, 10000, 0, 0, IERC20(address(0)));
+        emit KlerosCore.TokenAndETHShift(staker2, disputeID, 0, 10000, 0, 0, IERC20(address(0)));
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker2, 0, true);
+        emit SortitionModule.StakeLocked(staker2, 0, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker2, disputeID, 0, 10000, 0, 0, IERC20(address(0)));
+        emit KlerosCore.TokenAndETHShift(staker2, disputeID, 0, 10000, 0, 0, IERC20(address(0)));
         core.execute(disputeID, 0, 3); // Do 3 iterations to check penalties first
 
         (uint256 totalStaked, uint256 totalLocked, , ) = sortitionModule.getJurorBalance(staker1, GENERAL_COURT);
@@ -116,23 +116,23 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         (, totalLocked, , ) = sortitionModule.getJurorBalance(staker2, GENERAL_COURT);
         assertEq(totalLocked, 2000, "Tokens should still be locked for staker2");
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.repartitions, 3, "Wrong repartitions");
         assertEq(round.pnkPenalties, 1000, "Wrong pnkPenalties");
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker1, 0, true);
+        emit SortitionModule.StakeLocked(staker1, 0, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker1, disputeID, 0, 0, 0, 0, IERC20(address(0)));
+        emit KlerosCore.TokenAndETHShift(staker1, disputeID, 0, 0, 0, 0, IERC20(address(0)));
         // Check iterations for the winning staker to see the shifts
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker2, 1000, true);
+        emit SortitionModule.StakeLocked(staker2, 1000, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker2, disputeID, 0, 10000, 500, 0.045 ether, IERC20(address(0)));
+        emit KlerosCore.TokenAndETHShift(staker2, disputeID, 0, 10000, 500, 0.045 ether, IERC20(address(0)));
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeLocked(staker2, 1000, true);
+        emit SortitionModule.StakeLocked(staker2, 1000, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker2, disputeID, 0, 10000, 500, 0.045 ether, IERC20(address(0)));
+        emit KlerosCore.TokenAndETHShift(staker2, disputeID, 0, 10000, 500, 0.045 ether, IERC20(address(0)));
         core.execute(disputeID, 0, 10); // Finish the iterations. We need only 3 but check that it corrects the count.
 
         (, totalLocked, , ) = sortitionModule.getJurorBalance(staker2, GENERAL_COURT);
@@ -201,10 +201,10 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         uint256 ownerTokenBalance = pinakion.balanceOf(owner);
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.LeftoverRewardSent(disputeID, 0, 3000, 0.09 ether, IERC20(address(0)));
+        emit KlerosCore.LeftoverRewardSent(disputeID, 0, 3000, 0.09 ether, IERC20(address(0)));
         core.execute(disputeID, 0, 3);
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.pnkPenalties, 3000, "Wrong pnkPenalties");
         assertEq(round.sumFeeRewardPaid, 0, "Wrong sumFeeRewardPaid");
         assertEq(round.sumPnkRewardPaid, 0, "Wrong sumPnkRewardPaid");
@@ -272,11 +272,11 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
 
         // Note that these events are emitted only after the first iteration of execute() therefore the juror has been penalized only for 1000 PNK her.
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, newCourtID, 19000, 39000); // 1000 PNK penalty for voteID 0
+        emit SortitionModule.StakeSet(staker1, newCourtID, 19000, 39000); // 1000 PNK penalty for voteID 0
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, newCourtID, 0, 20000); // Starting with 40000 we first nullify the stake and remove 19000 and then remove penalty once since there was only first iteration (40000 - 20000 - 1000)
+        emit SortitionModule.StakeSet(staker1, newCourtID, 0, 20000); // Starting with 40000 we first nullify the stake and remove 19000 and then remove penalty once since there was only first iteration (40000 - 20000 - 1000)
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 0, 2000); // 2000 PNK should remain in balance to cover penalties since the first 1000 of locked pnk was already unlocked
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 0, 2000); // 2000 PNK should remain in balance to cover penalties since the first 1000 of locked pnk was already unlocked
         core.execute(disputeID, 0, 3);
 
         assertEq(pinakion.balanceOf(address(core)), 0, "Wrong token balance of the core");
@@ -335,7 +335,7 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         core.passPeriod(disputeID); // Execution
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 0, 0); // Juror should have no stake left and should be unstaked from the court automatically.
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 0, 0); // Juror should have no stake left and should be unstaked from the court automatically.
         core.execute(disputeID, 0, 6);
 
         assertEq(pinakion.balanceOf(address(core)), 0, "Wrong token balance of the core");
@@ -397,7 +397,7 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         core.passPeriod(disputeID); // Execution
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 0, 0); // Juror balance should be below minStake and should be unstaked from the court automatically.
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 0, 0); // Juror balance should be below minStake and should be unstaked from the court automatically.
         core.execute(disputeID, 0, 6);
 
         assertEq(pinakion.balanceOf(address(core)), 11000, "Wrong token balance of the core");
@@ -460,18 +460,18 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         assertEq(pinakion.balanceOf(address(core)), 1000, "Wrong token balance of the core");
         assertEq(pinakion.balanceOf(staker1), 999999999999999000, "Wrong token balance of staker1");
 
-        vm.expectRevert(SortitionModuleBase.NotEligibleForWithdrawal.selector);
+        vm.expectRevert(SortitionModule.NotEligibleForWithdrawal.selector);
         sortitionModule.withdrawLeftoverPNK(staker1);
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.LeftoverPNK(staker1, 1000);
+        emit SortitionModule.LeftoverPNK(staker1, 1000);
         core.execute(disputeID, 0, 6);
 
         (totalStaked, totalLocked, , ) = sortitionModule.getJurorBalance(staker1, GENERAL_COURT);
         assertEq(totalStaked, 1000, "Wrong amount staked");
         assertEq(totalLocked, 0, "Should be fully unlocked");
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.pnkPenalties, 0, "Wrong pnkPenalties");
         assertEq(round.sumFeeRewardPaid, 0.09 ether, "Wrong sumFeeRewardPaid");
         assertEq(round.sumPnkRewardPaid, 0, "Wrong sumPnkRewardPaid"); // No penalty so no rewards in pnk
@@ -480,12 +480,12 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         assertEq(pinakion.balanceOf(address(core)), 1000, "Wrong token balance of the core");
         assertEq(pinakion.balanceOf(staker1), 999999999999999000, "Wrong token balance of staker1");
 
-        vm.expectRevert(KlerosCoreBase.SortitionModuleOnly.selector);
+        vm.expectRevert(KlerosCore.SortitionModuleOnly.selector);
         vm.prank(owner);
         core.transferBySortitionModule(staker1, 1000);
 
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.LeftoverPNKWithdrawn(staker1, 1000);
+        emit SortitionModule.LeftoverPNKWithdrawn(staker1, 1000);
         sortitionModule.withdrawLeftoverPNK(staker1);
 
         (totalStaked, , , ) = sortitionModule.getJurorBalance(staker1, GENERAL_COURT);
@@ -537,12 +537,12 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
 
         // Check only once per penalty and per reward
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker1, disputeID, 0, 10000, 0, 0, feeToken);
+        emit KlerosCore.TokenAndETHShift(staker1, disputeID, 0, 10000, 0, 0, feeToken);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.TokenAndETHShift(staker1, disputeID, 0, 10000, 0, 0.06 ether, feeToken);
+        emit KlerosCore.TokenAndETHShift(staker1, disputeID, 0, 10000, 0, 0.06 ether, feeToken);
         core.execute(disputeID, 0, 6);
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.sumFeeRewardPaid, 0.18 ether, "Wrong sumFeeRewardPaid");
 
         assertEq(feeToken.balanceOf(address(core)), 0, "Wrong fee token balance of the core");
@@ -584,10 +584,10 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         core.passPeriod(disputeID); // Execution
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.LeftoverRewardSent(disputeID, 0, 3000, 0.18 ether, feeToken);
+        emit KlerosCore.LeftoverRewardSent(disputeID, 0, 3000, 0.18 ether, feeToken);
         core.execute(disputeID, 0, 10); // Put more iterations to check that they're capped
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.pnkPenalties, 3000, "Wrong pnkPenalties");
         assertEq(round.sumFeeRewardPaid, 0, "Wrong sumFeeRewardPaid");
         assertEq(round.sumPnkRewardPaid, 0, "Wrong sumPnkRewardPaid");
@@ -624,19 +624,19 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         disputeKit.castVote(disputeID, voteIDs, 2, 0, "XYZ");
         core.passPeriod(disputeID); // Appeal
 
-        vm.expectRevert(KlerosCoreBase.NotExecutionPeriod.selector);
+        vm.expectRevert(KlerosCore.NotExecutionPeriod.selector);
         core.executeRuling(disputeID);
 
         vm.warp(block.timestamp + timesPerPeriod[3]);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.execution);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.execution);
         core.passPeriod(disputeID); // Execution
 
-        (, , KlerosCoreBase.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
-        assertEq(uint256(period), uint256(KlerosCoreBase.Period.execution), "Wrong period");
+        (, , KlerosCore.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
+        assertEq(uint256(period), uint256(KlerosCore.Period.execution), "Wrong period");
         assertEq(lastPeriodChange, block.timestamp, "Wrong lastPeriodChange");
 
-        vm.expectRevert(KlerosCoreBase.DisputePeriodIsFinal.selector);
+        vm.expectRevert(KlerosCore.DisputePeriodIsFinal.selector);
         core.passPeriod(disputeID);
 
         vm.expectEmit(true, true, true, true);
@@ -645,7 +645,7 @@ contract KlerosCore_ExecutionTest is KlerosCore_TestBase {
         emit IArbitrableV2.Ruling(core, disputeID, 2);
         core.executeRuling(disputeID);
 
-        vm.expectRevert(KlerosCoreBase.RulingAlreadyExecuted.selector);
+        vm.expectRevert(KlerosCore.RulingAlreadyExecuted.selector);
         core.executeRuling(disputeID);
 
         (, , , bool ruled, ) = core.disputes(disputeID);
diff --git a/contracts/test/foundry/KlerosCore_Governance.t.sol b/contracts/test/foundry/KlerosCore_Governance.t.sol
index f34d64e79..53d438c4d 100644
--- a/contracts/test/foundry/KlerosCore_Governance.t.sol
+++ b/contracts/test/foundry/KlerosCore_Governance.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
-import {IArbitratorV2} from "../../src/arbitration/KlerosCoreBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
+import {IArbitratorV2} from "../../src/arbitration/KlerosCore.sol";
 import {DisputeKitSybilResistant} from "../../src/arbitration/dispute-kits/DisputeKitSybilResistant.sol";
 import {SortitionModuleMock} from "../../src/test/SortitionModuleMock.sol";
 import {PNK} from "../../src/token/PNK.sol";
@@ -13,27 +13,27 @@ import "../../src/libraries/Constants.sol";
 /// @dev Tests for KlerosCore governance functions (owner/guardian operations)
 contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
     function test_pause() public {
-        vm.expectRevert(KlerosCoreBase.GuardianOrOwnerOnly.selector);
+        vm.expectRevert(KlerosCore.GuardianOrOwnerOnly.selector);
         vm.prank(other);
         core.pause();
         // Note that we must explicitly switch to the owner/guardian address to make the call, otherwise Foundry treats UUPS proxy as msg.sender.
         vm.prank(guardian);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Paused();
+        emit KlerosCore.Paused();
         core.pause();
         assertEq(core.paused(), true, "Wrong paused value");
         // Switch between owner and guardian to test both. WhenNotPausedOnly modifier is triggered after owner's check.
         vm.prank(owner);
-        vm.expectRevert(KlerosCoreBase.WhenNotPausedOnly.selector);
+        vm.expectRevert(KlerosCore.WhenNotPausedOnly.selector);
         core.pause();
     }
 
     function test_unpause() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.unpause();
 
-        vm.expectRevert(KlerosCoreBase.WhenPausedOnly.selector);
+        vm.expectRevert(KlerosCore.WhenPausedOnly.selector);
         vm.prank(owner);
         core.unpause();
 
@@ -41,18 +41,18 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
         core.pause();
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.Unpaused();
+        emit KlerosCore.Unpaused();
         core.unpause();
         assertEq(core.paused(), false, "Wrong paused value");
     }
 
     function test_executeOwnerProposal() public {
         bytes memory data = abi.encodeWithSignature("changeOwner(address)", other);
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.executeOwnerProposal(address(core), 0, data);
 
-        vm.expectRevert(KlerosCoreBase.UnsuccessfulCall.selector);
+        vm.expectRevert(KlerosCore.UnsuccessfulCall.selector);
         vm.prank(owner);
         core.executeOwnerProposal(address(core), 0, data); // It'll fail because the core is not its own owner
 
@@ -64,7 +64,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
     }
 
     function test_changeOwner() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeOwner(payable(other));
         vm.prank(owner);
@@ -73,7 +73,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
     }
 
     function test_changeGuardian() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeGuardian(other);
         vm.prank(owner);
@@ -83,7 +83,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
 
     function test_changePinakion() public {
         PNK fakePNK = new PNK();
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changePinakion(fakePNK);
         vm.prank(owner);
@@ -92,7 +92,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
     }
 
     function test_changeJurorProsecutionModule() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeJurorProsecutionModule(other);
         vm.prank(owner);
@@ -102,7 +102,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
 
     function test_changeSortitionModule() public {
         SortitionModuleMock fakeSM = new SortitionModuleMock();
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeSortitionModule(fakeSM);
         vm.prank(owner);
@@ -112,19 +112,19 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
 
     function test_addNewDisputeKit() public {
         DisputeKitSybilResistant newDK = new DisputeKitSybilResistant();
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.addNewDisputeKit(newDK);
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitCreated(2, newDK);
+        emit KlerosCore.DisputeKitCreated(2, newDK);
         core.addNewDisputeKit(newDK);
         assertEq(address(core.disputeKits(2)), address(newDK), "Wrong address of new DK");
         assertEq(core.getDisputeKitsLength(), 3, "Wrong DK array length");
     }
 
     function test_createCourt() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         uint256[] memory supportedDK = new uint256[](2);
         supportedDK[0] = DISPUTE_KIT_CLASSIC;
@@ -141,7 +141,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             supportedDK
         );
 
-        vm.expectRevert(KlerosCoreBase.MinStakeLowerThanParentCourt.selector);
+        vm.expectRevert(KlerosCore.MinStakeLowerThanParentCourt.selector);
         vm.prank(owner);
         core.createCourt(
             GENERAL_COURT,
@@ -155,7 +155,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             supportedDK
         );
 
-        vm.expectRevert(KlerosCoreBase.UnsupportedDisputeKit.selector);
+        vm.expectRevert(KlerosCore.UnsupportedDisputeKit.selector);
         vm.prank(owner);
         uint256[] memory emptySupportedDK = new uint256[](0);
         core.createCourt(
@@ -170,7 +170,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             emptySupportedDK
         );
 
-        vm.expectRevert(KlerosCoreBase.InvalidForkingCourtAsParent.selector);
+        vm.expectRevert(KlerosCore.InvalidForkingCourtAsParent.selector);
         vm.prank(owner);
         core.createCourt(
             FORKING_COURT,
@@ -187,7 +187,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
         uint256[] memory badSupportedDK = new uint256[](2);
         badSupportedDK[0] = NULL_DISPUTE_KIT; // Include NULL_DK to check that it reverts
         badSupportedDK[1] = DISPUTE_KIT_CLASSIC;
-        vm.expectRevert(KlerosCoreBase.WrongDisputeKitIndex.selector);
+        vm.expectRevert(KlerosCore.WrongDisputeKitIndex.selector);
         vm.prank(owner);
         core.createCourt(
             GENERAL_COURT,
@@ -203,7 +203,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
 
         badSupportedDK[0] = DISPUTE_KIT_CLASSIC;
         badSupportedDK[1] = 2; // Check out of bounds index
-        vm.expectRevert(KlerosCoreBase.WrongDisputeKitIndex.selector);
+        vm.expectRevert(KlerosCore.WrongDisputeKitIndex.selector);
         vm.prank(owner);
         core.createCourt(
             GENERAL_COURT,
@@ -223,7 +223,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
         core.addNewDisputeKit(newDK);
         badSupportedDK = new uint256[](1);
         badSupportedDK[0] = 2; // Include only sybil resistant dk
-        vm.expectRevert(KlerosCoreBase.MustSupportDisputeKitClassic.selector);
+        vm.expectRevert(KlerosCore.MustSupportDisputeKitClassic.selector);
         vm.prank(owner);
         core.createCourt(
             GENERAL_COURT,
@@ -239,11 +239,11 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
 
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitEnabled(2, DISPUTE_KIT_CLASSIC, true);
+        emit KlerosCore.DisputeKitEnabled(2, DISPUTE_KIT_CLASSIC, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitEnabled(2, 2, true);
+        emit KlerosCore.DisputeKitEnabled(2, 2, true);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.CourtCreated(
+        emit KlerosCore.CourtCreated(
             2,
             GENERAL_COURT,
             true,
@@ -299,7 +299,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             supportedDK
         );
 
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeCourtParameters(
             GENERAL_COURT,
@@ -310,7 +310,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             50, // jurors for jump
             [uint256(10), uint256(20), uint256(30), uint256(40)] // Times per period
         );
-        vm.expectRevert(KlerosCoreBase.MinStakeLowerThanParentCourt.selector);
+        vm.expectRevert(KlerosCore.MinStakeLowerThanParentCourt.selector);
         vm.prank(owner);
         // Min stake of a parent became higher than of a child
         core.changeCourtParameters(
@@ -323,7 +323,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
             [uint256(10), uint256(20), uint256(30), uint256(40)] // Times per period
         );
         // Min stake of a child became lower than of a parent
-        vm.expectRevert(KlerosCoreBase.MinStakeLowerThanParentCourt.selector);
+        vm.expectRevert(KlerosCore.MinStakeLowerThanParentCourt.selector);
         vm.prank(owner);
         core.changeCourtParameters(
             newCourtID,
@@ -337,7 +337,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
 
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.CourtModified(
+        emit KlerosCore.CourtModified(
             GENERAL_COURT,
             true,
             2000,
@@ -366,43 +366,43 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
         vm.prank(owner);
         core.addNewDisputeKit(newDK);
 
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         uint256[] memory supportedDK = new uint256[](1);
         supportedDK[0] = newDkID;
         core.enableDisputeKits(GENERAL_COURT, supportedDK, true);
 
-        vm.expectRevert(KlerosCoreBase.WrongDisputeKitIndex.selector);
+        vm.expectRevert(KlerosCore.WrongDisputeKitIndex.selector);
         vm.prank(owner);
         supportedDK[0] = NULL_DISPUTE_KIT;
         core.enableDisputeKits(GENERAL_COURT, supportedDK, true);
 
-        vm.expectRevert(KlerosCoreBase.WrongDisputeKitIndex.selector);
+        vm.expectRevert(KlerosCore.WrongDisputeKitIndex.selector);
         vm.prank(owner);
         supportedDK[0] = 3; // Out of bounds
         core.enableDisputeKits(GENERAL_COURT, supportedDK, true);
 
-        vm.expectRevert(KlerosCoreBase.CannotDisableClassicDK.selector);
+        vm.expectRevert(KlerosCore.CannotDisableClassicDK.selector);
         vm.prank(owner);
         supportedDK[0] = DISPUTE_KIT_CLASSIC;
         core.enableDisputeKits(GENERAL_COURT, supportedDK, false);
 
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitEnabled(GENERAL_COURT, newDkID, true);
+        emit KlerosCore.DisputeKitEnabled(GENERAL_COURT, newDkID, true);
         supportedDK[0] = newDkID;
         core.enableDisputeKits(GENERAL_COURT, supportedDK, true);
         assertEq(core.isSupported(GENERAL_COURT, newDkID), true, "New DK should be supported by General court");
 
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitEnabled(GENERAL_COURT, newDkID, false);
+        emit KlerosCore.DisputeKitEnabled(GENERAL_COURT, newDkID, false);
         core.enableDisputeKits(GENERAL_COURT, supportedDK, false);
         assertEq(core.isSupported(GENERAL_COURT, newDkID), false, "New DK should be disabled in General court");
     }
 
     function test_changeAcceptedFeeTokens() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeAcceptedFeeTokens(feeToken, true);
 
@@ -418,7 +418,7 @@ contract KlerosCore_GovernanceTest is KlerosCore_TestBase {
     }
 
     function test_changeCurrencyRates() public {
-        vm.expectRevert(KlerosCoreBase.OwnerOnly.selector);
+        vm.expectRevert(KlerosCore.OwnerOnly.selector);
         vm.prank(other);
         core.changeCurrencyRates(feeToken, 100, 200);
 
diff --git a/contracts/test/foundry/KlerosCore_Initialization.t.sol b/contracts/test/foundry/KlerosCore_Initialization.t.sol
index d35190870..7e521063d 100644
--- a/contracts/test/foundry/KlerosCore_Initialization.t.sol
+++ b/contracts/test/foundry/KlerosCore_Initialization.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
+import {KlerosCore, IERC721} from "../../src/arbitration/KlerosCore.sol";
 import {KlerosCoreMock} from "../../src/test/KlerosCoreMock.sol";
 import {DisputeKitClassic} from "../../src/arbitration/dispute-kits/DisputeKitClassic.sol";
 import {SortitionModuleMock} from "../../src/test/SortitionModuleMock.sol";
@@ -45,6 +45,9 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
         assertEq(core.isSupported(GENERAL_COURT, NULL_DISPUTE_KIT), false, "General court null dk should be false");
         assertEq(core.isSupported(GENERAL_COURT, DISPUTE_KIT_CLASSIC), true, "General court classic dk should be true");
         assertEq(core.paused(), false, "Wrong paused value");
+        assertEq(core.wNative(), address(wNative), "Wrong wNative");
+        assertEq(address(core.jurorNft()), address(0), "Wrong jurorNft");
+        assertEq(core.arbitrableWhitelistEnabled(), false, "Wrong arbitrableWhitelistEnabled");
 
         assertEq(pinakion.name(), "Pinakion", "Wrong token name");
         assertEq(pinakion.symbol(), "PNK", "Wrong token symbol");
@@ -71,6 +74,9 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
         assertEq(sortitionModule.randomNumber(), 0, "randomNumber should be 0");
         assertEq(sortitionModule.delayedStakeWriteIndex(), 0, "delayedStakeWriteIndex should be 0");
         assertEq(sortitionModule.delayedStakeReadIndex(), 1, "Wrong delayedStakeReadIndex");
+        assertEq(sortitionModule.maxStakePerJuror(), type(uint256).max, "Wrong maxStakePerJuror");
+        assertEq(sortitionModule.maxTotalStaked(), type(uint256).max, "Wrong maxTotalStaked");
+        assertEq(sortitionModule.totalStaked(), 0, "Wrong totalStaked");
 
         (uint256 K, uint256 nodeLength) = sortitionModule.getSortitionProperties(bytes32(uint256(FORKING_COURT)));
         assertEq(K, 5, "Wrong tree K FORKING_COURT");
@@ -123,12 +129,14 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
         DisputeKitClassic newDisputeKit = DisputeKitClassic(address(proxyDk));
 
         bytes memory initDataSm = abi.encodeWithSignature(
-            "initialize(address,address,uint256,uint256,address)",
+            "initialize(address,address,uint256,uint256,address,uint256,uint256)",
             newOwner,
             address(proxyCore),
             newMinStakingTime,
             newMaxDrawingTime,
-            newRng
+            newRng,
+            type(uint256).max,
+            type(uint256).max
         );
 
         UUPSProxy proxySm = new UUPSProxy(address(smLogic), initDataSm);
@@ -138,12 +146,12 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
 
         KlerosCoreMock newCore = KlerosCoreMock(address(proxyCore));
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitCreated(DISPUTE_KIT_CLASSIC, newDisputeKit);
+        emit KlerosCore.DisputeKitCreated(DISPUTE_KIT_CLASSIC, newDisputeKit);
         vm.expectEmit(true, true, true, true);
 
         uint256[] memory supportedDK = new uint256[](1);
         supportedDK[0] = DISPUTE_KIT_CLASSIC;
-        emit KlerosCoreBase.CourtCreated(
+        emit KlerosCore.CourtCreated(
             GENERAL_COURT,
             FORKING_COURT,
             false,
@@ -155,7 +163,7 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
             supportedDK
         );
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitEnabled(GENERAL_COURT, DISPUTE_KIT_CLASSIC, true);
+        emit KlerosCore.DisputeKitEnabled(GENERAL_COURT, DISPUTE_KIT_CLASSIC, true);
         newCore.initialize(
             newOwner,
             newGuardian,
@@ -167,7 +175,8 @@ contract KlerosCore_InitializationTest is KlerosCore_TestBase {
             newTimesPerPeriod,
             newSortitionExtraData,
             newSortitionModule,
-            address(wNative)
+            address(wNative),
+            IERC721(address(0))
         );
     }
 }
diff --git a/contracts/test/foundry/KlerosCore_RNG.t.sol b/contracts/test/foundry/KlerosCore_RNG.t.sol
index da3df03ed..0afd0ba43 100644
--- a/contracts/test/foundry/KlerosCore_RNG.t.sol
+++ b/contracts/test/foundry/KlerosCore_RNG.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {SortitionModuleBase} from "../../src/arbitration/SortitionModuleBase.sol";
+import {SortitionModule} from "../../src/arbitration/SortitionModule.sol";
 import {RNGWithFallback, IRNG} from "../../src/rng/RNGWithFallback.sol";
 import {RNGMock} from "../../src/test/RNGMock.sol";
 import "../../src/libraries/Constants.sol";
@@ -34,7 +34,7 @@ contract KlerosCore_RNGTest is KlerosCore_TestBase {
         sortitionModule.passPhase(); // Generating
         assertEq(rngFallback.requestTimestamp(), block.timestamp, "Wrong request timestamp");
 
-        vm.expectRevert(SortitionModuleBase.RandomNumberNotReady.selector);
+        vm.expectRevert(SortitionModule.RandomNumberNotReady.selector);
         sortitionModule.passPhase();
 
         vm.warp(block.timestamp + fallbackTimeout + 1);
diff --git a/contracts/test/foundry/KlerosCore_Staking.t.sol b/contracts/test/foundry/KlerosCore_Staking.t.sol
index a315debcf..070a38716 100644
--- a/contracts/test/foundry/KlerosCore_Staking.t.sol
+++ b/contracts/test/foundry/KlerosCore_Staking.t.sol
@@ -2,8 +2,8 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
-import {SortitionModuleBase} from "../../src/arbitration/SortitionModuleBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
+import {SortitionModule} from "../../src/arbitration/SortitionModule.sol";
 import {ISortitionModule} from "../../src/arbitration/interfaces/ISortitionModule.sol";
 import {IKlerosCore, KlerosCoreSnapshotProxy} from "../../src/arbitration/view/KlerosCoreSnapshotProxy.sol";
 import "../../src/libraries/Constants.sol";
@@ -14,32 +14,32 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
     function test_setStake_increase() public {
         vm.prank(owner);
         core.pause();
-        vm.expectRevert(KlerosCoreBase.WhenNotPausedOnly.selector);
+        vm.expectRevert(KlerosCore.WhenNotPausedOnly.selector);
         vm.prank(staker1);
         core.setStake(GENERAL_COURT, 1000);
         vm.prank(owner);
         core.unpause();
 
-        vm.expectRevert(KlerosCoreBase.StakingNotPossibleInThisCourt.selector);
+        vm.expectRevert(KlerosCore.StakingNotPossibleInThisCourt.selector);
         vm.prank(staker1);
         core.setStake(FORKING_COURT, 1000);
 
         uint96 badCourtID = 2;
-        vm.expectRevert(KlerosCoreBase.StakingNotPossibleInThisCourt.selector);
+        vm.expectRevert(KlerosCore.StakingNotPossibleInThisCourt.selector);
         vm.prank(staker1);
         core.setStake(badCourtID, 1000);
 
-        vm.expectRevert(KlerosCoreBase.StakingLessThanCourtMinStake.selector);
+        vm.expectRevert(KlerosCore.StakingLessThanCourtMinStake.selector);
         vm.prank(staker1);
         core.setStake(GENERAL_COURT, 800);
 
-        vm.expectRevert(KlerosCoreBase.StakingZeroWhenNoStake.selector);
+        vm.expectRevert(KlerosCore.StakingZeroWhenNoStake.selector);
         vm.prank(staker1);
         core.setStake(GENERAL_COURT, 0);
 
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 1001, 1001);
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 1001, 1001);
         core.setStake(GENERAL_COURT, 1001);
 
         (uint256 totalStaked, uint256 totalLocked, uint256 stakedInCourt, uint256 nbCourts) = sortitionModule
@@ -58,14 +58,14 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
         assertEq(pinakion.balanceOf(staker1), 999999999999998999, "Wrong token balance of staker1"); // 1 eth - 1001 wei
         assertEq(pinakion.allowance(staker1, address(core)), 999999999999998999, "Wrong allowance for staker1");
 
-        vm.expectRevert(KlerosCoreBase.StakingTransferFailed.selector); // This  error will be caught because owner didn't approve any tokens for KlerosCore
+        vm.expectRevert(KlerosCore.StakingTransferFailed.selector); // This  error will be caught because owner didn't approve any tokens for KlerosCore
         vm.prank(owner);
         core.setStake(GENERAL_COURT, 1000);
 
         // Increase stake one more time to verify the correct behavior
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 2000, 2000);
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 2000, 2000);
         core.setStake(GENERAL_COURT, 2000);
 
         (totalStaked, totalLocked, stakedInCourt, nbCourts) = sortitionModule.getJurorBalance(staker1, GENERAL_COURT);
@@ -111,7 +111,7 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
         vm.prank(address(core));
         pinakion.transfer(staker1, 1); // Manually send 1 token to make the withdrawal fail
 
-        vm.expectRevert(KlerosCoreBase.UnstakingTransferFailed.selector);
+        vm.expectRevert(KlerosCore.UnstakingTransferFailed.selector);
         vm.prank(staker1);
         core.setStake(GENERAL_COURT, 0);
 
@@ -165,7 +165,7 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
         assertEq(courts.length, 4, "Wrong courts count");
 
         uint96 excessiveCourtID = 5;
-        vm.expectRevert(KlerosCoreBase.StakingInTooManyCourts.selector);
+        vm.expectRevert(KlerosCore.StakingInTooManyCourts.selector);
         vm.prank(staker1);
         core.setStake(excessiveCourtID, 2000);
     }
@@ -188,7 +188,7 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
 
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeDelayed(staker1, GENERAL_COURT, 1500);
+        emit SortitionModule.StakeDelayed(staker1, GENERAL_COURT, 1500);
         core.setStake(GENERAL_COURT, 1500);
 
         uint256 delayedStakeId = sortitionModule.delayedStakeWriteIndex();
@@ -234,7 +234,7 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
 
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeDelayed(staker1, GENERAL_COURT, 1800);
+        emit SortitionModule.StakeDelayed(staker1, GENERAL_COURT, 1800);
         core.setStake(GENERAL_COURT, 1800);
 
         (uint256 totalStaked, , uint256 stakedInCourt, ) = sortitionModule.getJurorBalance(staker1, GENERAL_COURT);
@@ -301,7 +301,7 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
         vm.prank(staker2);
         core.setStake(GENERAL_COURT, 10000);
 
-        vm.expectRevert(SortitionModuleBase.NoDelayedStakeToExecute.selector);
+        vm.expectRevert(SortitionModule.NoDelayedStakeToExecute.selector);
         sortitionModule.executeDelayedStakes(5);
 
         // Set the stake and create a dispute to advance the phase
@@ -314,13 +314,13 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
         uint256 disputeID = 0;
         core.draw(disputeID, DEFAULT_NB_OF_JURORS);
 
-        vm.expectRevert(SortitionModuleBase.NotStakingPhase.selector);
+        vm.expectRevert(SortitionModule.NotStakingPhase.selector);
         sortitionModule.executeDelayedStakes(5);
 
         // Create delayed stake
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeDelayed(staker1, GENERAL_COURT, 1500);
+        emit SortitionModule.StakeDelayed(staker1, GENERAL_COURT, 1500);
         core.setStake(GENERAL_COURT, 1500);
 
         assertEq(pinakion.balanceOf(address(core)), 10000, "Wrong token balance of the core"); // Balance should not increase because the stake was delayed
@@ -329,14 +329,14 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
         // Create delayed stake for another staker
         vm.prank(staker2);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeDelayed(staker2, GENERAL_COURT, 0);
+        emit SortitionModule.StakeDelayed(staker2, GENERAL_COURT, 0);
         core.setStake(GENERAL_COURT, 0);
         assertEq(pinakion.balanceOf(staker2), 999999999999990000, "Wrong token balance of staker2"); // Balance should not change since wrong phase
 
         // Create another delayed stake for staker1 on top of it to check the execution
         vm.prank(staker1);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeDelayed(staker1, GENERAL_COURT, 1800);
+        emit SortitionModule.StakeDelayed(staker1, GENERAL_COURT, 1800);
         core.setStake(GENERAL_COURT, 1800);
 
         assertEq(sortitionModule.delayedStakeWriteIndex(), 3, "Wrong delayedStakeWriteIndex");
@@ -384,9 +384,9 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
 
         // 2 events should be emitted but the 2nd stake supersedes the first one in the end.
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 1500, 1500);
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 1500, 1500);
         vm.expectEmit(true, true, true, true);
-        emit SortitionModuleBase.StakeSet(staker1, GENERAL_COURT, 1800, 1800);
+        emit SortitionModule.StakeSet(staker1, GENERAL_COURT, 1800, 1800);
         sortitionModule.executeDelayedStakes(20); // Deliberately ask for more iterations than needed
 
         assertEq(sortitionModule.delayedStakeWriteIndex(), 3, "Wrong delayedStakeWriteIndex");
@@ -416,7 +416,7 @@ contract KlerosCore_StakingTest is KlerosCore_TestBase {
 
     function test_setStakeBySortitionModule() public {
         // Note that functionality of this function was checked during delayed stakes execution
-        vm.expectRevert(KlerosCoreBase.SortitionModuleOnly.selector);
+        vm.expectRevert(KlerosCore.SortitionModuleOnly.selector);
         vm.prank(owner);
         core.setStakeBySortitionModule(staker1, GENERAL_COURT, 1000);
     }
diff --git a/contracts/test/foundry/KlerosCore_TestBase.sol b/contracts/test/foundry/KlerosCore_TestBase.sol
index 762d71db9..9418f2444 100644
--- a/contracts/test/foundry/KlerosCore_TestBase.sol
+++ b/contracts/test/foundry/KlerosCore_TestBase.sol
@@ -3,13 +3,13 @@ pragma solidity ^0.8.24;
 
 import {Test} from "forge-std/Test.sol";
 import {console} from "forge-std/console.sol"; // Import the console for logging
-import {KlerosCoreMock, KlerosCoreBase} from "../../src/test/KlerosCoreMock.sol";
-import {IArbitratorV2} from "../../src/arbitration/KlerosCoreBase.sol";
+import {KlerosCoreMock, KlerosCore, IERC721} from "../../src/test/KlerosCoreMock.sol";
+import {IArbitratorV2} from "../../src/arbitration/KlerosCore.sol";
 import {IDisputeKit} from "../../src/arbitration/interfaces/IDisputeKit.sol";
 import {DisputeKitClassic, DisputeKitClassicBase} from "../../src/arbitration/dispute-kits/DisputeKitClassic.sol";
 import {DisputeKitSybilResistant} from "../../src/arbitration/dispute-kits/DisputeKitSybilResistant.sol";
 import {ISortitionModule} from "../../src/arbitration/interfaces/ISortitionModule.sol";
-import {SortitionModuleMock, SortitionModuleBase} from "../../src/test/SortitionModuleMock.sol";
+import {SortitionModuleMock, SortitionModule} from "../../src/test/SortitionModuleMock.sol";
 import {UUPSProxy} from "../../src/proxy/UUPSProxy.sol";
 import {BlockHashRNG} from "../../src/rng/BlockHashRNG.sol";
 import {RNGWithFallback, IRNG} from "../../src/rng/RNGWithFallback.sol";
@@ -126,12 +126,14 @@ abstract contract KlerosCore_TestBase is Test {
         disputeKit = DisputeKitClassic(address(proxyDk));
 
         bytes memory initDataSm = abi.encodeWithSignature(
-            "initialize(address,address,uint256,uint256,address)",
+            "initialize(address,address,uint256,uint256,address,uint256,uint256)",
             owner,
             address(proxyCore),
             minStakingTime,
             maxDrawingTime,
-            rng
+            rng,
+            type(uint256).max,
+            type(uint256).max
         );
 
         UUPSProxy proxySm = new UUPSProxy(address(smLogic), initDataSm);
@@ -151,7 +153,8 @@ abstract contract KlerosCore_TestBase is Test {
             timesPerPeriod,
             sortitionExtraData,
             sortitionModule,
-            address(wNative)
+            address(wNative),
+            IERC721(address(0))
         );
         vm.prank(staker1);
         pinakion.approve(address(core), 1 ether);
diff --git a/contracts/test/foundry/KlerosCore_Voting.t.sol b/contracts/test/foundry/KlerosCore_Voting.t.sol
index 7d84f18e1..504c9c644 100644
--- a/contracts/test/foundry/KlerosCore_Voting.t.sol
+++ b/contracts/test/foundry/KlerosCore_Voting.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import {KlerosCore_TestBase} from "./KlerosCore_TestBase.sol";
-import {KlerosCoreBase} from "../../src/arbitration/KlerosCoreBase.sol";
+import {KlerosCore} from "../../src/arbitration/KlerosCore.sol";
 import {DisputeKitClassic, DisputeKitClassicBase} from "../../src/arbitration/dispute-kits/DisputeKitClassic.sol";
 import {IDisputeKit} from "../../src/arbitration/interfaces/IDisputeKit.sol";
 import {UUPSProxy} from "../../src/proxy/UUPSProxy.sol";
@@ -44,17 +44,17 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
         vm.expectRevert(DisputeKitClassicBase.NotCommitPeriod.selector);
         disputeKit.castCommit(disputeID, voteIDs, commit);
 
-        vm.expectRevert(KlerosCoreBase.EvidenceNotPassedAndNotAppeal.selector);
+        vm.expectRevert(KlerosCore.EvidenceNotPassedAndNotAppeal.selector);
         core.passPeriod(disputeID);
         vm.warp(block.timestamp + timesPerPeriod[0]);
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.commit);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.commit);
         core.passPeriod(disputeID);
 
-        (, , KlerosCoreBase.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
+        (, , KlerosCore.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
 
-        assertEq(uint256(period), uint256(KlerosCoreBase.Period.commit), "Wrong period");
+        assertEq(uint256(period), uint256(KlerosCore.Period.commit), "Wrong period");
         assertEq(lastPeriodChange, block.timestamp, "Wrong lastPeriodChange");
 
         vm.prank(staker1);
@@ -149,12 +149,12 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
         vm.warp(block.timestamp + timesPerPeriod[0]);
         core.passPeriod(disputeID); // Commit
 
-        vm.expectRevert(KlerosCoreBase.CommitPeriodNotPassed.selector);
+        vm.expectRevert(KlerosCore.CommitPeriodNotPassed.selector);
         core.passPeriod(disputeID);
 
         vm.warp(block.timestamp + timesPerPeriod[1]);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.vote);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.vote);
         core.passPeriod(disputeID);
     }
 
@@ -178,18 +178,18 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
         vm.expectRevert(DisputeKitClassicBase.NotVotePeriod.selector);
         disputeKit.castVote(disputeID, voteIDs, 2, 0, "XYZ"); // Leave salt empty as not needed
 
-        vm.expectRevert(KlerosCoreBase.DisputeStillDrawing.selector);
+        vm.expectRevert(KlerosCore.DisputeStillDrawing.selector);
         core.passPeriod(disputeID);
 
         core.draw(disputeID, 1); // Draw the last juror
 
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.vote);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.vote);
         core.passPeriod(disputeID); // Vote
 
-        (, , KlerosCoreBase.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
+        (, , KlerosCore.Period period, , uint256 lastPeriodChange) = core.disputes(disputeID);
 
-        assertEq(uint256(period), uint256(KlerosCoreBase.Period.vote), "Wrong period");
+        assertEq(uint256(period), uint256(KlerosCore.Period.vote), "Wrong period");
         assertEq(lastPeriodChange, block.timestamp, "Wrong lastPeriodChange");
 
         vm.prank(staker1);
@@ -250,7 +250,7 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
         assertEq(totalVoted, 2, "totalVoted should be 2");
         assertEq(choiceCount, 1, "choiceCount should be 1 for first choice");
 
-        vm.expectRevert(KlerosCoreBase.VotePeriodNotPassed.selector);
+        vm.expectRevert(KlerosCore.VotePeriodNotPassed.selector);
         core.passPeriod(disputeID);
 
         voteIDs = new uint256[](1);
@@ -285,14 +285,14 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
         vm.warp(block.timestamp + timesPerPeriod[0]);
         core.passPeriod(disputeID); // Votes
 
-        vm.expectRevert(KlerosCoreBase.VotePeriodNotPassed.selector);
+        vm.expectRevert(KlerosCore.VotePeriodNotPassed.selector);
         core.passPeriod(disputeID);
 
         vm.warp(block.timestamp + timesPerPeriod[2]);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.AppealPossible(disputeID, arbitrable);
+        emit KlerosCore.AppealPossible(disputeID, arbitrable);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.appeal);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.appeal);
         core.passPeriod(disputeID);
     }
 
@@ -380,7 +380,7 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
 
         // Should pass period by counting only committed votes.
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.NewPeriod(disputeID, KlerosCoreBase.Period.appeal);
+        emit KlerosCore.NewPeriod(disputeID, KlerosCore.Period.appeal);
         core.passPeriod(disputeID);
     }
 
@@ -407,7 +407,7 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
 
         vm.prank(owner);
         vm.expectEmit(true, true, true, true);
-        emit KlerosCoreBase.DisputeKitEnabled(GENERAL_COURT, newDkID, true);
+        emit KlerosCore.DisputeKitEnabled(GENERAL_COURT, newDkID, true);
         supportedDK[0] = newDkID;
         core.enableDisputeKits(GENERAL_COURT, supportedDK, true);
         assertEq(core.isSupported(GENERAL_COURT, newDkID), true, "New DK should be supported by General court");
@@ -434,7 +434,7 @@ contract KlerosCore_VotingTest is KlerosCore_TestBase {
         vm.warp(block.timestamp + rngLookahead);
         sortitionModule.passPhase(); // Drawing phase
 
-        KlerosCoreBase.Round memory round = core.getRoundInfo(disputeID, 0);
+        KlerosCore.Round memory round = core.getRoundInfo(disputeID, 0);
         assertEq(round.disputeKitID, newDkID, "Wrong DK ID");
 
         core.draw(disputeID, DEFAULT_NB_OF_JURORS);
diff --git a/contracts/test/integration/getContractsEthers.test.ts b/contracts/test/integration/getContractsEthers.test.ts
index 736717626..8bd2b9cf5 100644
--- a/contracts/test/integration/getContractsEthers.test.ts
+++ b/contracts/test/integration/getContractsEthers.test.ts
@@ -4,10 +4,8 @@ import { arbitrum, arbitrumSepolia } from "viem/chains";
 import { getContracts } from "../../deployments/contractsEthers";
 import {
   KlerosCore__factory,
-  KlerosCoreNeo__factory,
   KlerosCoreUniversity__factory,
   SortitionModule__factory,
-  SortitionModuleNeo__factory,
   SortitionModuleUniversity__factory,
   DisputeKitClassic__factory,
   DisputeResolver__factory,
@@ -99,14 +97,14 @@ const universityContractMapping: ContractMapping = {
   klerosCoreSnapshotProxy: { name: "KlerosCoreSnapshotProxy" },
 };
 
-const neoContractMapping: ContractMapping = {
-  klerosCore: { name: "KlerosCoreNeo" },
-  sortition: { name: "SortitionModuleNeo" },
-  disputeKitClassic: { name: "DisputeKitClassicNeo" },
-  disputeKitShutter: { name: "DisputeKitShutterNeo" },
-  disputeKitGated: { name: "DisputeKitGatedNeo" },
-  disputeKitGatedShutter: { name: "DisputeKitGatedShutterNeo" },
-  disputeResolver: { name: "DisputeResolverNeo" },
+const mainnetContractMapping: ContractMapping = {
+  klerosCore: { name: "KlerosCore" },
+  sortition: { name: "SortitionModule" },
+  disputeKitClassic: { name: "DisputeKitClassic" },
+  disputeKitShutter: { name: "DisputeKitShutter" },
+  disputeKitGated: { name: "DisputeKitGated" },
+  disputeKitGatedShutter: { name: "DisputeKitGatedShutter" },
+  disputeResolver: { name: "DisputeResolver" },
   disputeTemplateRegistry: { name: "DisputeTemplateRegistry" },
   evidence: { name: "EvidenceModule" },
   policyRegistry: { name: "PolicyRegistry" },
@@ -291,16 +289,16 @@ describe("getContractsEthers", async () => {
     await verifyDeployedAddresses(contracts, NETWORKS.TESTNET, testnetContractMapping);
   });
 
-  it("should return correct contract instances for mainnetNeo", async () => {
-    const contracts = await getContracts(arbitrumProvider, "mainnetNeo");
+  it("should return correct contract instances for mainnet", async () => {
+    const contracts = await getContracts(arbitrumProvider, "mainnet");
 
     // Verify chain ID
     const network = await arbitrumProvider.getNetwork();
     expect(network.chainId).to.equal(arbitrum.id);
 
     // Verify contract instances
-    expect(contracts.klerosCore).to.be.instanceOf(getConstructor(KlerosCoreNeo__factory, arbitrumProvider));
-    expect(contracts.sortition).to.be.instanceOf(getConstructor(SortitionModuleNeo__factory, arbitrumProvider));
+    expect(contracts.klerosCore).to.be.instanceOf(getConstructor(KlerosCore__factory, arbitrumProvider));
+    expect(contracts.sortition).to.be.instanceOf(getConstructor(SortitionModule__factory, arbitrumProvider));
     verifyCommonContractInstances(contracts, arbitrumProvider);
     expect(contracts.disputeKitShutter).to.not.be.null;
     expect(contracts.disputeKitGated).to.not.be.null;
@@ -310,7 +308,7 @@ describe("getContractsEthers", async () => {
 
     // Verify all contract addresses
     await verifyAllContractAddresses(contracts);
-    await verifyDeployedAddresses(contracts, NETWORKS.MAINNET, neoContractMapping);
+    await verifyDeployedAddresses(contracts, NETWORKS.MAINNET, mainnetContractMapping);
   });
 
   it("should throw error for unsupported deployment", async () => {
diff --git a/contracts/test/integration/getContractsViem.test.ts b/contracts/test/integration/getContractsViem.test.ts
index a32db3c86..67c5a92af 100644
--- a/contracts/test/integration/getContractsViem.test.ts
+++ b/contracts/test/integration/getContractsViem.test.ts
@@ -77,14 +77,14 @@ const universityContractMapping: ContractMapping = {
   klerosCoreSnapshotProxy: { name: "KlerosCoreSnapshotProxy" },
 };
 
-const neoContractMapping: ContractMapping = {
-  klerosCore: { name: "KlerosCoreNeo" },
-  sortition: { name: "SortitionModuleNeo" },
-  disputeKitClassic: { name: "DisputeKitClassicNeo" },
-  disputeKitShutter: { name: "DisputeKitShutterNeo" },
-  disputeKitGated: { name: "DisputeKitGatedNeo" },
-  disputeKitGatedShutter: { name: "DisputeKitGatedShutterNeo" },
-  disputeResolver: { name: "DisputeResolverNeo" },
+const mainnetContractMapping: ContractMapping = {
+  klerosCore: { name: "KlerosCore" },
+  sortition: { name: "SortitionModule" },
+  disputeKitClassic: { name: "DisputeKitClassic" },
+  disputeKitShutter: { name: "DisputeKitShutter" },
+  disputeKitGated: { name: "DisputeKitGated" },
+  disputeKitGatedShutter: { name: "DisputeKitGatedShutter" },
+  disputeResolver: { name: "DisputeResolver" },
   disputeTemplateRegistry: { name: "DisputeTemplateRegistry" },
   evidence: { name: "EvidenceModule" },
   policyRegistry: { name: "PolicyRegistry" },
@@ -240,10 +240,10 @@ describe("getContractsViem", () => {
     await verifyDeployedAddresses(contracts, NETWORKS.TESTNET, testnetContractMapping);
   });
 
-  it("should return correct contract instances for mainnetNeo", async () => {
+  it("should return correct contract instances for mainnet", async () => {
     const contracts = getContracts({
       publicClient: arbitrumClient,
-      deployment: "mainnetNeo",
+      deployment: "mainnet",
     });
 
     // Verify chain ID
@@ -262,7 +262,7 @@ describe("getContractsViem", () => {
     expect(contracts.randomizerRng).to.not.be.undefined;
 
     // Verify deployed addresses
-    await verifyDeployedAddresses(contracts, NETWORKS.MAINNET, neoContractMapping);
+    await verifyDeployedAddresses(contracts, NETWORKS.MAINNET, mainnetContractMapping);
   });
 
   it("should throw error for unsupported deployment", () => {