diff --git a/packages/contracts-ethers/package.json b/packages/contracts-ethers/package.json
index 12eb4b2..e3e4a57 100644
--- a/packages/contracts-ethers/package.json
+++ b/packages/contracts-ethers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xinfin/osx-daofin-contracts-ethers",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "description": "The Aragon OSx contract definitions for ethers.js",
   "main": "dist/bundle-cjs.js",
   "module": "dist/bundle-esm.js",
diff --git a/packages/contracts/.openzeppelin/unknown-51.json b/packages/contracts/.openzeppelin/unknown-51.json
index d705f9a..aefdd44 100644
--- a/packages/contracts/.openzeppelin/unknown-51.json
+++ b/packages/contracts/.openzeppelin/unknown-51.json
@@ -2656,11 +2656,6 @@
       "txHash": "0xe800381186360f8f38f3ff9bf6690457e09875357c596006cde5ef96c25036fb",
       "kind": "uups"
     },
-    {
-      "address": "0x275416d9E7464D7341127Ef96ad51513e4ce554d",
-      "txHash": "0x9641266247d14dc5e05660bb7839df1446098461738b88aa6611de5ed3badda2",
-      "kind": "uups"
-    },
     {
       "address": "0x603c0eD5b18Bd88E46E9C5322857a9180c64b3F5",
       "txHash": "0x1eb489a155d6077f6b6f40cba8f1614f4db387df417a7075d0121895548280d0",
@@ -2671,21 +2666,6 @@
       "txHash": "0x550c333579c30919304ea6c8cfa9fb6680c0980e4fc13857adbbc6b65f9fb765",
       "kind": "uups"
     },
-    {
-      "address": "0xf44013B7d59BEE7EBA4Aa91Ae2cE7777268458e7",
-      "txHash": "0x417bf4f294bb825e0c74b25a59d272dbb81773f3c52c03eed298835bb68e12a1",
-      "kind": "uups"
-    },
-    {
-      "address": "0xA4C64a712573c696F08F061da44617fD042044e1",
-      "txHash": "0x0883d216f1c41b39067d7392529dc125cca799a061938b4107a603f844be0e9f",
-      "kind": "uups"
-    },
-    {
-      "address": "0xE5677fB8b3f5b94DB468969d649113d3353E8C60",
-      "txHash": "0x5ef4172fd8bf40d4573490f33ab8afb9bea345e77a796260a3aa856776d6d573",
-      "kind": "uups"
-    },
     {
       "address": "0xc7E5f32eb040Dc15D34786888A8CF0c05be5b70C",
       "txHash": "0x5f462b57b3c2695e0f0261501bd3f8e6ae660d86260f68685d288bc1be4c2280",
@@ -2706,16 +2686,6 @@
       "txHash": "0x988687a6d1ad5bd2aaeecd0f75c54737be1f5dc4e5d9950ee85da480241379f4",
       "kind": "uups"
     },
-    {
-      "address": "0x15437cB99F183d0B56F82Dc0e03E33d407366e87",
-      "txHash": "0x89906571cdaefc41fd993167c09ee6487d87a7f044ea8135c6f6aed582e5f67a",
-      "kind": "uups"
-    },
-    {
-      "address": "0x8dbCAe9D2223A47420B97233D8a5efd11362Ad83",
-      "txHash": "0xd13000152c614c7fe98b3d522d2ef8d27461bed5c3555238a749e9dc6cbe2704",
-      "kind": "uups"
-    },
     {
       "address": "0x3D813EA1743aeE91A38C214B8bC047718D378D84",
       "txHash": "0x63306948aaf9c96165669a05f8da82395b431d7b405d8ae151f35be039f05e41",
@@ -2741,31 +2711,6 @@
       "txHash": "0x0c0e928b087073ba5445b652179a4a34b559afb472b419fad7dd1632334d1fef",
       "kind": "uups"
     },
-    {
-      "address": "0x865c1CadDedB978bD5E1405ea453e8c550882d68",
-      "txHash": "0x6cc071b075ebba20eaa033d07f2fc89c6217a52ddd0e7c9682f0a2e63466ff27",
-      "kind": "uups"
-    },
-    {
-      "address": "0x84AA32ecA24991d059001591A417793da00627b4",
-      "txHash": "0xe69e53093dff3eafa22831860e9672fc94528812c530a0b6879ebbdc4744c7d5",
-      "kind": "uups"
-    },
-    {
-      "address": "0xAB7d2422F9E26F39F7797bE46951CCB1BD56E2E2",
-      "txHash": "0x2860e0f6a71e0170f59342659e967994d67cc0536980dfcd6ad18bea3e598e0b",
-      "kind": "uups"
-    },
-    {
-      "address": "0xC27051cb0717F0515A9B1AB99fd67EdF81a225f7",
-      "txHash": "0xa04021036fa60bdf6d4e652913170acb33630e2c893916e778843ca1af753162",
-      "kind": "uups"
-    },
-    {
-      "address": "0x2fe13262200Cc0a7Ae8f536DF8009559a137F3bB",
-      "txHash": "0x2cfea05e2afacf113d9eba8e18db6d7ea6f55c2d21a3ec31afd99d0f13cf0d5e",
-      "kind": "uups"
-    },
     {
       "address": "0xFe6b00Af82e8e6283c613BF262A0527a064d0E78",
       "txHash": "0xea5ad71fcba8f55cac9322cdd9579b2d401d3c3611f50f839011b6d798399e73",
@@ -2776,66 +2721,16 @@
       "txHash": "0xcd1c2a8784e0cf986e8ffccc6a66b1783af9890b4b1d2fce4ed4bcb68041d66f",
       "kind": "uups"
     },
-    {
-      "address": "0x668687C5FC1C6265484b09Ae50224670CE6EB838",
-      "txHash": "0x03b04c3b9f5cd8e7a72d7c7162936a7c02cf7f5cac6c23f16882e027a3b6be22",
-      "kind": "uups"
-    },
-    {
-      "address": "0xfa1F749007c273Ff200A6671e5bcA7dbcd78bbfe",
-      "txHash": "0xd1051e981dc412f855949f4406c6fb6a59dffb77f2ff70412b60da3e33874f95",
-      "kind": "uups"
-    },
-    {
-      "address": "0x697cd08Ca8Ad420cF25d1D6055E9C4E73ae32De4",
-      "txHash": "0x764230aa4ab72681519b23274e8f284657b7840e699a1c4c193bf7913eefe247",
-      "kind": "uups"
-    },
-    {
-      "address": "0xd5EffA1F7D0393E5dDF219836f73b8b10dFDfcbA",
-      "txHash": "0xe3d76de43e0a5f5a0bbb80af374d7d353e33f93c5e713bd6ed981b52dd2ce25f",
-      "kind": "uups"
-    },
-    {
-      "address": "0x646857436BaDD4D73Ca296dcd714d4c5bd39D0Aa",
-      "txHash": "0xfeae427aafa79197bc4eaef5b52269a5b666b915e07a15db948959770c5944d3",
-      "kind": "uups"
-    },
-    {
-      "address": "0x118e1b5c17e8348Fbf528FBA6Ffc5F7497e0faf6",
-      "txHash": "0x7500efe2a01365d111338d564b3a25574c25fb4e6a3e86358a76e315cde3e3d7",
-      "kind": "uups"
-    },
-    {
-      "address": "0x9367c36890Add4DcC03dF798e360c5cA288180Ff",
-      "txHash": "0xc0d6e5594b3269e56bd79f941875a20f0492e586d56ca0a27f486d9e65cf768f",
-      "kind": "uups"
-    },
     {
       "address": "0x9725e45bFC8834DC3144aC1895178B0aF0a2a9E5",
       "txHash": "0x9e976276add50aa39fadbdd759818d95b5d8eb48dbf8bd6efc97ff58f60cc89c",
       "kind": "uups"
     },
-    {
-      "address": "0x75Df8C6196B442DE497F25575C681C75fb30f07B",
-      "txHash": "0x002d92a7b16f9de92c0db3fb779789a9b9e524146e829115ffc42b4e3de70bed",
-      "kind": "uups"
-    },
     {
       "address": "0xf48138A489d35b7eD1b6A4Bc44db82FB191ADCCb",
       "txHash": "0xaf1ca6f433a4c99f6da1df7c2a50173d3ef0aaa456119faa0699e31bbb5bdb5c",
       "kind": "uups"
     },
-    {
-      "address": "0x49Db64E11A5253fdba6C72C9DEE2E9432644376c",
-      "txHash": "0xd12b5959ead4fab606c939d0866a443652b8aa59433428c6326fdc20a54afd89",
-      "kind": "uups"
-    },
-    {
-      "address": "0x59897a1d8086fDD7Ac07026F769ebd4091c7E944",
-      "txHash": "0x3b467ffa8d9317a8209df3df13e7bfed0787922dd40113f859dd54654028dfb5",
-      "kind": "uups"
-    },
     {
       "address": "0xadD206118B4bfe25da0592447ceC4004B12323c7",
       "txHash": "0x19c5f524bbec2dde0114bab05290d9a2290148dfb4978850d7419f39149e6248",
@@ -2861,31 +2756,6 @@
       "txHash": "0xe4e769ac23230552f0b2a38a08ea752850b5ed6d4c8872142f76d8e8ce3abe0e",
       "kind": "uups"
     },
-    {
-      "address": "0x3120617c04d2b077135b3378e42dFA0d6E68cA5c",
-      "txHash": "0x61a4bf8ea72af8f75dc4e5ff9b6542baf236c3ae07c3a81756356ba726a9f7a6",
-      "kind": "uups"
-    },
-    {
-      "address": "0x3E4f2e4227199a59Fd229E0D7eb2aA5D1cAE6a7e",
-      "txHash": "0x86cb0b131b9370e4f3129aed337d6330df15396e8312d57bb3a1c895ed892df6",
-      "kind": "uups"
-    },
-    {
-      "address": "0x3Fa04BbAF2963570F07f4FB1F29308BA4415D799",
-      "txHash": "0x01bc16cbcaedc1fed9504e25f36fc4f85c6f4173a6abcf1e680c33c19d7c8f9b",
-      "kind": "uups"
-    },
-    {
-      "address": "0xDb661D2198344800565174035f88521F053893Ba",
-      "txHash": "0xfc2d00555a17c5cdc4fef1b0bc2239ebf6172eadce7ddba595945724a7af2ecf",
-      "kind": "uups"
-    },
-    {
-      "address": "0x3Fdc3304C14abBCbeDD245fBad696f6B7dfFAC16",
-      "txHash": "0x764ca2a000c5196e32be307100608f497645c7552c498f1cbba6b9c5259d59db",
-      "kind": "uups"
-    },
     {
       "address": "0x55D4BDD066f2B5309E2621F62E368e80FE491Ea4",
       "txHash": "0x73a194c791ce9097c49f43f210656144db97005aeba05356501d7a8af065bc72",
@@ -3076,16 +2946,6 @@
       "txHash": "0xbbb89e01cd732bb5f4093c9075293a43a9ff3323611d589028ccb0987ea08d8a",
       "kind": "uups"
     },
-    {
-      "address": "0x8bA21B0ed0b4b60B799671Cb434D171c11601E18",
-      "txHash": "0x9b702a56a260784b5234036b33539226701da50f83dcf0e4a7390daa9758c90a",
-      "kind": "uups"
-    },
-    {
-      "address": "0xD25A231f9f705476B4869Bf03c973f11462C605D",
-      "txHash": "0x179320b9aa70765922e59a0648892c425f04b1ffc1c00b4406d39a9a155448ff",
-      "kind": "uups"
-    },
     {
       "address": "0x694094109618D3714fF4ef8fe92924ACc65c8161",
       "txHash": "0x09321ff1c07bcd7c6cdd8bccfc83607191c3ff03a1226529b16250371b4bf6a2",
@@ -3106,71 +2966,16 @@
       "txHash": "0x0db9f5b618b951d9260ae8a8d874e2e21e1e36bfab3000a505b289b302fbec8c",
       "kind": "uups"
     },
-    {
-      "address": "0x655c2D2f612CEBc6f465741993D5d14D502d32d2",
-      "txHash": "0x404a696af0b751ddeadf1dceb6f51e52fb5f347832a7b3cf457a71f088b7cbac",
-      "kind": "uups"
-    },
-    {
-      "address": "0x606EF38d0b8D2eD2c19C230313Ec6A6A17C52d94",
-      "txHash": "0xe74093d72ec55e6902fe0010f783af6145c384bbcb49540a8be3f23f53240ab2",
-      "kind": "uups"
-    },
-    {
-      "address": "0x8A44Bba1Bc7a32A36ace6a44028dAB17AEDB9e7f",
-      "txHash": "0x2fe561b2c72aeeeeb0625ef6a96fc929b7232502b6c87f2862f110284a4a4d1b",
-      "kind": "uups"
-    },
-    {
-      "address": "0x35090B2657c6CD50A942369C511608D74497D6bd",
-      "txHash": "0x0f3ccd40efc8245bf85e4e304e0c6b23a5d51d644aaa8ddd4203d41c18dd0da4",
-      "kind": "uups"
-    },
-    {
-      "address": "0xA80D08433d0D61c9049b7434fa9ab967A9655f5D",
-      "txHash": "0xbec13fb0040ce0625e7c54dd60233faca5c53aebd1228beea5ef7587af723782",
-      "kind": "uups"
-    },
-    {
-      "address": "0xdBb5bfb00f92d61dC565A5Abcf0a84E96B599089",
-      "txHash": "0xfcc508a45ac99702c63018074eec43d71060d618446e4d206146fb64657e5e45",
-      "kind": "uups"
-    },
-    {
-      "address": "0x8496c5C441Ea8f34396E6079608D87469088faF8",
-      "txHash": "0xdf17c5c34fe63aa3a57f8ac50b73897289c130b8628122fcd1bd520077fff9bf",
-      "kind": "uups"
-    },
     {
       "address": "0x74b4B94093B7b5AC5c9384bFfaa4aD8fa99A94a7",
       "txHash": "0x8d1676a45d328b24ffc3e0dcd952f4b6dcc727af75862758b3a51db16cceb114",
       "kind": "uups"
     },
-    {
-      "address": "0x911F6D6c7Bd4e9EC33133c961885D68173428Be5",
-      "txHash": "0xecbfffde07a4e4f6d5d4a226fb0421c55423c21f97586d2b9cf613339d8782c3",
-      "kind": "uups"
-    },
-    {
-      "address": "0xc1e14E9c3B767DbbBf15fB954b7009b0a6F3abC8",
-      "txHash": "0xf26ef67249f77f9eacb518d7462f55d07da068a6278ff61cfbe69d19c40dd8f2",
-      "kind": "uups"
-    },
-    {
-      "address": "0x5ABf2A7e1f421fC4e0fAdB8561A300e32A8C9089",
-      "txHash": "0x4e47849665a4d4932f90b11005612eb9360ac5ed00e44fdfbb31f45e6d6438b4",
-      "kind": "uups"
-    },
     {
       "address": "0x1F317D2dFB4ec608A333a24D854F42DDD840BFCC",
       "txHash": "0x12c8c23f4c1dddd286af7021e17cddf56be8fb05360883a04afdaf454b38e0bd",
       "kind": "uups"
     },
-    {
-      "address": "0x04f130A93ebd3fEA7ada6f4e0AdB65D8AdAee814",
-      "txHash": "0xe41793ba425ae11f6983c99f616b23ce4f9ec5c112e91fd0e9d5035c8045e065",
-      "kind": "uups"
-    },
     {
       "address": "0x02787ade6D484a5F37Be19F522C1858b9D8f6183",
       "txHash": "0x7c736ba831557d55626105c6562b883bd1851f6bd541878eba3c6ef3956024e7",
@@ -3291,51 +3096,16 @@
       "txHash": "0x33b4a6224bc3aa9f69d380c713c524a195ccbf7f8ff374330d6ab917bf3871e8",
       "kind": "uups"
     },
-    {
-      "address": "0x8272772dAE72a44E6bcD1056b7D40607EBebc65c",
-      "txHash": "0x0a1bbe210ac8ac277f9920b98abb2fd44888df711f4fe9e60206adbff47abd5d",
-      "kind": "uups"
-    },
-    {
-      "address": "0x6fcB18fC636516F43a8DC5682dEcFEA76EF777FE",
-      "txHash": "0xd40b6d04b1f7e087b5de6810fb39b627d2d6b4456b0b796e5082657fe77b5084",
-      "kind": "uups"
-    },
-    {
-      "address": "0x988914A8564AC9f4a49173d8BDceb7f77a931FAE",
-      "txHash": "0x585453d163fee1518e7ed1f76cc08357d790326b446177287d62d38e196b7f58",
-      "kind": "uups"
-    },
-    {
-      "address": "0xA3f1dC418867bF1a9cE5316bF300Cad89146D277",
-      "txHash": "0x9f65552cd2ffc9a7d194fc1e8ca699624c61f9f15acfec4e5e5936a2b845d29b",
-      "kind": "uups"
-    },
-    {
-      "address": "0x50e1F64A81F7D88213E6912b71cb60af5bD0b701",
-      "txHash": "0xeb815730d28c9f6838de935a205a9e73514ae895d04ff7b9c219dcc343a04804",
-      "kind": "uups"
-    },
     {
       "address": "0xb1800EFBe4125c2791698729e3c78b341Cc5d52A",
       "txHash": "0x873fa9c516fd567b97981717c9b4cc41a37e45ceb97bf5449ae953947042816f",
       "kind": "uups"
     },
-    {
-      "address": "0x8A3Ae795bE69470927D9527FEFB68C0a90c10e15",
-      "txHash": "0x0a54b45f740bcc0e943bd69f07c67a03e18877e96a3f797b791afc9103e1872c",
-      "kind": "uups"
-    },
     {
       "address": "0x03A33010BAC951FB75e1B6664161710ae22b584e",
       "txHash": "0x89bbc22a182c611a7238850442aa40a15b59ab34ddab74aeae1bfc24033a68fb",
       "kind": "uups"
     },
-    {
-      "address": "0x9dfdf66813E318e2392C7833037ed2D0429eeccF",
-      "txHash": "0xe019a9140ed3d4bbd4f455e49c00db529dad862aabead54233b31d51ce8d3911",
-      "kind": "uups"
-    },
     {
       "address": "0x1D7220FD270c13E37dda497E911625aBDC5669a6",
       "txHash": "0xb0da56752104306980bf0397cbd649cbf526971dae3a0d5fdca5c87122426582",
@@ -3356,41 +3126,6 @@
       "txHash": "0xa24cba861bf3420a17d46956a833aa93db5c01c17f7a9f0f26d6b23e58ff799d",
       "kind": "uups"
     },
-    {
-      "address": "0xd5cE4A45edB44e7Da756567de363F940FcE2CFA0",
-      "txHash": "0x93542f7aa77e15f79dcc42f6b88982a1b20892f0093fc49f5be324bf68107eb9",
-      "kind": "uups"
-    },
-    {
-      "address": "0x46f2B60D579E0E1049Ce25bC8356164349Df78C2",
-      "txHash": "0x33a8c063245fd87b8dde558f604792cc7725caeb4df453689c30c506f8fb223b",
-      "kind": "uups"
-    },
-    {
-      "address": "0x096e66a3Baba882Bad0EEc677fF48549BD06a920",
-      "txHash": "0x06cf5461166fea5cf1da43737fcdc73bbf5fa4793e516ec6fd7dc2527a202ca4",
-      "kind": "uups"
-    },
-    {
-      "address": "0x197014aA64Dba537735eb0ac59C9e66773d90b70",
-      "txHash": "0xd330a3fb336a4a827c120ff2d0d1bce3b26bebe8c85f220f525fab8f944ab9c6",
-      "kind": "uups"
-    },
-    {
-      "address": "0x4d9DCb37Dfbba4CaaF662305825c314EFf1473ac",
-      "txHash": "0xe413bc77725b1af4903f4d492b056e242fdcc851c772773c69c6cfc44df8c250",
-      "kind": "uups"
-    },
-    {
-      "address": "0x14975864da4506ebc18FD59E924F8097aaB46Fe6",
-      "txHash": "0xf67d1794d949d6fdf1ffadd3531b27a14a5e95c28aa04319e2e4cfef52ce1bea",
-      "kind": "uups"
-    },
-    {
-      "address": "0x1a2EB51a968436B003aA15F76db4eD56b01874F3",
-      "txHash": "0xe8e30720fd010a9698a0f4350b64b62045db911fe6c7decd99fb5770acc93319",
-      "kind": "uups"
-    },
     {
       "address": "0xF6e93Cc35af1b609147b1fd60879a508009A7A81",
       "txHash": "0x3fa56feee4f5292f69fee11c9dc68e93241a7523db089f96dec95db411ad079c",
@@ -3411,46 +3146,11 @@
       "txHash": "0x6f04c9047b360438c2e36ad747dd684d2b4dc1851f5f1261f39e4e4bdf1455f3",
       "kind": "uups"
     },
-    {
-      "address": "0x55f9f63B14b98E9181FAcB00F3920A258cAD58dD",
-      "txHash": "0x3c79a9db85966429d9b68402cc49b0c530e1ff122e94898ef92d7d3b2fe6ba3c",
-      "kind": "uups"
-    },
-    {
-      "address": "0x55d95C89728203664257343b542e25274f85f332",
-      "txHash": "0x4e294881be193555dab2fc2a414bd17d00a37cedc3332a9b3450984e06ec4950",
-      "kind": "uups"
-    },
-    {
-      "address": "0xA0E718CA2E32b983096596F45927cC5C54271CB4",
-      "txHash": "0xed03cbc7d15e6ab066f44b05e0d7f5ee507f31ea29464121555fbcf35a931019",
-      "kind": "uups"
-    },
-    {
-      "address": "0xe703f7Eb388E06B13C19af85425592188B164d40",
-      "txHash": "0x7d5b2b5a2dd8f6bdefc90a79021a7457020f8dc18e482c36da07dc5535070a88",
-      "kind": "uups"
-    },
-    {
-      "address": "0x73E9d4fB434B74D6c7B0030f6eeaE297ab371f0C",
-      "txHash": "0x93f17ac8d112f3e734d713ab9500625e83866e7b2998d34f27e89f1d822bc339",
-      "kind": "uups"
-    },
     {
       "address": "0x740daf81fD9a4Fb5BFD4ae85f9c5cB660163A4b0",
       "txHash": "0x6021458d56fd67cae4df8d8a69843bcbe304e6a91fed2df2e556da5697b59ef9",
       "kind": "uups"
     },
-    {
-      "address": "0xFa6236D6b2C432270eC9833AFD082aD335202d19",
-      "txHash": "0x5c8a7d01a9e5aa0f915d7dbc9a4387c5c4b540812dca1df3070762e7415a5103",
-      "kind": "uups"
-    },
-    {
-      "address": "0x46490c0747587F24db5439C7F35596A1AC64b099",
-      "txHash": "0xff05f10d141ff50690c5b31a236cf07b15a501cf59a9e20df62507b50bac184b",
-      "kind": "uups"
-    },
     {
       "address": "0x0E0e5ba4545388521D5c389dC4177B151c725bd3",
       "txHash": "0xc24196043d5912669deeb4a6ef68abb531939d5afb0213748cb6610e761798f7",
@@ -3487,221 +3187,526 @@
       "kind": "uups"
     },
     {
-      "address": "0x2dc0d912945B5A5FCd74909CB6A5c6674524508f",
-      "txHash": "0xeb5039b41d3d537e6918754f8635c50fcef5ec908112ff370666a5db4ba1982c",
+      "address": "0x8b4970a9242D34Ad1e217015B57CcA6f433FEdEd",
+      "txHash": "0x6bb5b47012ba2f48242aff7744b1c9b599c97219d8e1b9e1be4d9afb85b5193b",
       "kind": "uups"
     },
     {
-      "address": "0xcdE3AaaA7d636245eF8736350A89A025BFC3B489",
-      "txHash": "0x01447ccf7be6386dd93943334c9e1e20135f918b56cf64c3b6f044b141c031eb",
+      "address": "0x5368b567995D15B3D03c5e6FD4dccE8d21684c63",
+      "txHash": "0x3bee2499a94eda5e71322f9427e02dc159c490ad6d7bde83c817545092f32c29",
       "kind": "uups"
     },
     {
-      "address": "0x214D975d963998287bbe69566A358968940a8042",
-      "txHash": "0x30e761711a9f6d2a48397832569c9b3ab7cddbc68ecd7761c2b8ccba6dea2b59",
+      "address": "0x50b1268748Ca5d4b7030d350eeB9857644009410",
+      "txHash": "0xf062b0e067a5c50dea7bf4398f5957d97c657b428cda2a0ada4e4c8cd5fd463a",
       "kind": "uups"
     },
     {
-      "address": "0x26EB7E3f8B0453d779BB846Ebc7c59AC6Cc20dCD",
-      "txHash": "0xa5a7bb640afcc5eb49604ed88ff40f8c048f8ac2d59fc640b90186ae9be9b23c",
+      "address": "0xC3638588270e4a8f3A4036913e1CC4D4B7fbf12D",
+      "txHash": "0xd5d903678a158874d2d9342c5c231700a37de87f600d3093c64d9608ac2cee5f",
       "kind": "uups"
     },
     {
-      "address": "0x61e88eb68cA4f4bf7621e3fE2201e133679b932E",
-      "txHash": "0x4afc9056dbdea34a38225c0c3c4c6571cb862f3adb25299af71523bd9e43cef2",
+      "address": "0x3738320d5d49FD6F071b776a8cdA665E791Bc688",
+      "txHash": "0x0be61cedf11ac7c328ca9325e9b4589510e064e605d6c05de7bf438eb6ea4bf9",
       "kind": "uups"
     },
     {
-      "address": "0x6B78C4810F1b1fa3be087DE96d65098EA6109A8d",
-      "txHash": "0x3ea49a3daaedc2054d35d0a6122e6027e29ef492b05230da4f2f8f0ed07496ff",
+      "address": "0xEA46711daF379025c4819Eb1028A00310d639594",
+      "txHash": "0x6aa62efe24d5b96139d4a30ec01cc2d00537a961cee35e30a84638ea2ea1caa5",
       "kind": "uups"
     },
     {
-      "address": "0x5583BDfEE186eD83FaD30C517403aDc68202B3bB",
-      "txHash": "0xe2c9f9410e2a99a204f97db0f3c2f01d7fedbe72e4b1bd75e51b0891e12d9226",
+      "address": "0x3088770F9419D1a149Fc29B5Dbd381aC1c2A49c3",
+      "txHash": "0x829c3112fdb20ef62861552905a9e617ac0422e4caa18c4ca14b942b8ccab064",
+      "kind": "uups"
+    },
+    {
+      "address": "0x87C0911EeBfB0B4f65AeD1C39813866a14c80637",
+      "txHash": "0x7f47bfc3db6902a710954094f8bcfae185334b2228d1a1a96ba760fab374294d",
+      "kind": "uups"
+    },
+    {
+      "address": "0x31859953a33b8CD839D508bfc8461b6583ac9191",
+      "txHash": "0xba27d94d5df892aa07ae1babbd5cab676b2fe208efdb4ac30d79790f3d9bab74",
+      "kind": "uups"
+    },
+    {
+      "address": "0x3CEDFfB91cc162CA9e3dccB0215841EeC03Caf01",
+      "txHash": "0x1b33a12cf61ee4da888c3794506624d5a27d3ede46c041470c4ea950a2f7686c",
+      "kind": "uups"
+    },
+    {
+      "address": "0x8953343Ef1160695aAe2E0e76413202b8f405B41",
+      "txHash": "0xe5892762c2a4dcbe7ee90fe20f725eaa8d826c124e44bb38bc095f70aeffbc86",
       "kind": "uups"
     },
     {
       "address": "0x970110ca3f8f285C72FF57fC918eA0B87BdE91a9",
-      "txHash": "0x7fa74e57ee3f13bac9187bfd66265f978b74425ef259b003ebea246257f9ff48",
+      "txHash": "0x260bc74a3992975437e045aee7ea6eb7f4dde1d1d0cd721b830de64db4d94377",
       "kind": "uups"
     },
     {
       "address": "0xf2Ba12388e2D2B79C90D629Ee9e33ce7d9B83dC2",
-      "txHash": "0x2a674e53bba6978ffaf9098735b3ba2efa6751c759e3d01eb9caba983d63ee7c",
+      "txHash": "0x94132e60c1645d265b5780c99287ad5d964a1529731a02d82208d51d03e5e042",
       "kind": "uups"
     },
     {
-      "address": "0xf42B5f49289931842ae1EdC2816B0D167E80c830",
-      "txHash": "0xb7e2409b27dd149bba15ca7508b6699a37d3c15dc9a7b710195b1dda0e901797",
+      "address": "0x664800ACD55EA28Aa9923EAfB097Ba5C5C59deDb",
+      "txHash": "0x33b47f3dd1d1111c3909dc6626475c9981bc36c661051d8c9ec9a94ae7f51201",
       "kind": "uups"
     },
     {
-      "address": "0x4D922E01f20326f9228A78BAE1990D8241c56e1E",
-      "txHash": "0xc491c868977bed8502799981807769380fbe241b5be9b7eea5a55ac8eb47461f",
+      "address": "0x9F0d6B72b53552f02D9A61eeB0AD89118632afFe",
+      "txHash": "0xdc9a4f5750d3c102ab611f1df443f8958991cb1dfabdc7edce0b107db29b8943",
       "kind": "uups"
     },
     {
-      "address": "0x541840391d15930dc109A3De3131b112B285ba73",
-      "txHash": "0xe3f0c2debfe5982f94697c10b798ab9e824f5f65f4a105357083b9d0287c066d",
+      "address": "0xA80D08433d0D61c9049b7434fa9ab967A9655f5D",
+      "txHash": "0x4d734679a37c86c8bb54b66483b5f922178a6d6bb2cbe540a8288cebe2c6067e",
       "kind": "uups"
     },
     {
-      "address": "0xF6339c755D0390780ACA047bFbEDbf06d0e8944B",
-      "txHash": "0x2c93413060814a8c1b2c7cf0a4e0a59be8f3d05f5afd7e0d74538797825c390f",
+      "address": "0xf44013B7d59BEE7EBA4Aa91Ae2cE7777268458e7",
+      "txHash": "0x9e683cdc82ef4e1230db455ba01f6e01e96157fe14cbdac6cc2ec7c84688dd98",
+      "kind": "uups"
+    },
+    {
+      "address": "0x118e1b5c17e8348Fbf528FBA6Ffc5F7497e0faf6",
+      "txHash": "0x2ebc9d7176a3babcefe0f7b9e2855d5589fc73615f55da4c1d3fe0622ca2af45",
+      "kind": "uups"
+    },
+    {
+      "address": "0x2fe13262200Cc0a7Ae8f536DF8009559a137F3bB",
+      "txHash": "0xab76ca881dd92ce01e38d48bcf5592bdfc8aa4d3e8a27acb1fc3f63a96918b67",
+      "kind": "uups"
+    },
+    {
+      "address": "0x14975864da4506ebc18FD59E924F8097aaB46Fe6",
+      "txHash": "0xa9d54d4620924255649fd613702e0dac7d82993734133fbd5e3e22e62579dd47",
+      "kind": "uups"
+    },
+    {
+      "address": "0xfa1F749007c273Ff200A6671e5bcA7dbcd78bbfe",
+      "txHash": "0x84a302e520d446f1d21ea583bd91f653b62d99d67b0e5e864d7eed97c6257ac8",
+      "kind": "uups"
+    },
+    {
+      "address": "0x35090B2657c6CD50A942369C511608D74497D6bd",
+      "txHash": "0xdafec12fa44a100920ea47be6ed6e8ba16382684a5e84ab445ea8ee94ea41e5a",
+      "kind": "uups"
+    },
+    {
+      "address": "0xd5EffA1F7D0393E5dDF219836f73b8b10dFDfcbA",
+      "txHash": "0x61b67f7b8a24fcc67132ad0038b988474f5c54e178080804371b4d65742aaee1",
+      "kind": "uups"
+    },
+    {
+      "address": "0xC27051cb0717F0515A9B1AB99fd67EdF81a225f7",
+      "txHash": "0xf5f5c804d1888ab5593106a7ac1b3e86b0c6dc60fa878755c50978e02543b05b",
+      "kind": "uups"
+    },
+    {
+      "address": "0xA0E718CA2E32b983096596F45927cC5C54271CB4",
+      "txHash": "0x5a2cd6b3c0f1e7abc2c7b8c8a7b7ee0d4db71eb1741910073bbfa0bb14a8e30e",
+      "kind": "uups"
+    },
+    {
+      "address": "0xAB7d2422F9E26F39F7797bE46951CCB1BD56E2E2",
+      "txHash": "0x427774586e2f56d608ca98b9266a52da263c957cffc6ec1262a2c9b4afc0f311",
+      "kind": "uups"
+    },
+    {
+      "address": "0x3120617c04d2b077135b3378e42dFA0d6E68cA5c",
+      "txHash": "0x3e7e8bf91cf45d1147fd7417919dec953322b08bae681225ca3f90bb9a9ca965",
+      "kind": "uups"
+    },
+    {
+      "address": "0xA4C64a712573c696F08F061da44617fD042044e1",
+      "txHash": "0xa950c37fa2053dc648387f6539ee1a6dfb36cccad8c1e73edd5d2b62c0acdca9",
+      "kind": "uups"
+    },
+    {
+      "address": "0x61e88eb68cA4f4bf7621e3fE2201e133679b932E",
+      "txHash": "0x42b153687bad0fbfc4df6d0214e6f96e44490390668ff087c2c9488fa5d1d145",
+      "kind": "uups"
+    },
+    {
+      "address": "0x8A44Bba1Bc7a32A36ace6a44028dAB17AEDB9e7f",
+      "txHash": "0x9bf23b1a70bd32ef119e5cfd5e590b92b4244f1f7dd87cfaac224050c48842d2",
+      "kind": "uups"
+    },
+    {
+      "address": "0x15437cB99F183d0B56F82Dc0e03E33d407366e87",
+      "txHash": "0x1d2ac9e14ee0f5217cd3fe76d9d88eb767817da397044e6f03aea9326765ce49",
+      "kind": "uups"
+    },
+    {
+      "address": "0x214D975d963998287bbe69566A358968940a8042",
+      "txHash": "0x7ca56f59f5f9c30212c9461de7ff8767348413fa30461b806301000d52954016",
+      "kind": "uups"
+    },
+    {
+      "address": "0xd5cE4A45edB44e7Da756567de363F940FcE2CFA0",
+      "txHash": "0xb6f5a0e087f8cf611a1d500dea6a3ddf84185a6b11753a65542bef3934dfd571",
+      "kind": "uups"
+    },
+    {
+      "address": "0x646857436BaDD4D73Ca296dcd714d4c5bd39D0Aa",
+      "txHash": "0x72feb6b99727b47cdddd52f18efabbf77b440b2bd5328b1c86e2e2d28ac3fdc3",
+      "kind": "uups"
+    },
+    {
+      "address": "0x697cd08Ca8Ad420cF25d1D6055E9C4E73ae32De4",
+      "txHash": "0x80e1d90f04f814d542d7eab2a915ee5a390c2f23eac4d0db73158647a737cde8",
+      "kind": "uups"
+    },
+    {
+      "address": "0x197014aA64Dba537735eb0ac59C9e66773d90b70",
+      "txHash": "0x8ec02749e7dded07fa4a742da9904f56a0980f2ea21491c01b1bba4833006e5d",
+      "kind": "uups"
+    },
+    {
+      "address": "0x655c2D2f612CEBc6f465741993D5d14D502d32d2",
+      "txHash": "0x5d16e357f49c6a084f151be977ae60dd1e375071281f87832642a10ef6b86511",
+      "kind": "uups"
+    },
+    {
+      "address": "0x3E4f2e4227199a59Fd229E0D7eb2aA5D1cAE6a7e",
+      "txHash": "0xbf07ef5b8fc21fb79090a567e53670cd51f485ad09d1a5e7cc707303b7f86222",
+      "kind": "uups"
+    },
+    {
+      "address": "0x55d95C89728203664257343b542e25274f85f332",
+      "txHash": "0x7b8794a42e5f1b9e40bed85f9b6138d7687354e21be70def004ce14e8c9fa479",
+      "kind": "uups"
+    },
+    {
+      "address": "0xe703f7Eb388E06B13C19af85425592188B164d40",
+      "txHash": "0x771a104fb58232cb004016dbb7645e0c7ff660b7b93b20316a345140e040e3d1",
+      "kind": "uups"
+    },
+    {
+      "address": "0x73E9d4fB434B74D6c7B0030f6eeaE297ab371f0C",
+      "txHash": "0x90ee133561e0ce27292c4685ab285c87fc39c7135ac98014512670068063a697",
+      "kind": "uups"
+    },
+    {
+      "address": "0xA3f1dC418867bF1a9cE5316bF300Cad89146D277",
+      "txHash": "0x60ff0c7a57669dc9027976455917177e59a30b57309a4153a8d243e296b219d7",
       "kind": "uups"
     },
     {
       "address": "0xF5DA7de62D05a401CA6B4b56Ae2fA5b74C2D72Dc",
-      "txHash": "0x6a1059d216788d5146ef3a053103e644d0c74f7116ac940d47731849b066ecf9",
+      "txHash": "0xd54e288c2faf04a90d11a597e0da8cd42c00ce9e005b751619c8788799e012e2",
       "kind": "uups"
     },
     {
-      "address": "0x664800ACD55EA28Aa9923EAfB097Ba5C5C59deDb",
-      "txHash": "0x808bfb181110dc5c8d19a51a7d7cbe7d0d06d1bc3fe5cd23d74d2a293f97f6a6",
+      "address": "0xDb661D2198344800565174035f88521F053893Ba",
+      "txHash": "0x54ae283b5c301aa6e929a5538fa1d9c08be362a48d664e6a77612f530526c29d",
       "kind": "uups"
     },
     {
-      "address": "0x9F0d6B72b53552f02D9A61eeB0AD89118632afFe",
-      "txHash": "0xd4964ef33118282f01bacc1d1cb2d362d25bc1661e271dc10b64f7f2d9828285",
+      "address": "0x46490c0747587F24db5439C7F35596A1AC64b099",
+      "txHash": "0xf4f6d3390d6f6c20b3f000451ed841f86729942da6d30287eefdf5ed936ad078",
       "kind": "uups"
     },
     {
-      "address": "0x8b4970a9242D34Ad1e217015B57CcA6f433FEdEd",
-      "txHash": "0x6bb5b47012ba2f48242aff7744b1c9b599c97219d8e1b9e1be4d9afb85b5193b",
+      "address": "0x668687C5FC1C6265484b09Ae50224670CE6EB838",
+      "txHash": "0xf8d0b82f358f32d3d3abc1ab24780d6c9696c17fbdda2cf3c6e9d4a8f464c584",
       "kind": "uups"
     },
     {
-      "address": "0x5368b567995D15B3D03c5e6FD4dccE8d21684c63",
-      "txHash": "0x3bee2499a94eda5e71322f9427e02dc159c490ad6d7bde83c817545092f32c29",
+      "address": "0xcdE3AaaA7d636245eF8736350A89A025BFC3B489",
+      "txHash": "0x14eeca2b55f913a5736c9afa05d694788436170574d4f7085d98c83221de0707",
       "kind": "uups"
     },
     {
-      "address": "0x50b1268748Ca5d4b7030d350eeB9857644009410",
-      "txHash": "0xf062b0e067a5c50dea7bf4398f5957d97c657b428cda2a0ada4e4c8cd5fd463a",
+      "address": "0x6B78C4810F1b1fa3be087DE96d65098EA6109A8d",
+      "txHash": "0x4f4f6e42abf62c5cac48b166a7dbf7f2f24485d1cbfea40d7a86489686061072",
       "kind": "uups"
     },
     {
-      "address": "0xf5e5C4A4f49Bd23dD11188391BaE6c551e3B0C73",
-      "txHash": "0x2518cfdaa98db4538fc81ba7a6b1c2a27aae036372b3fc05eb373cb962de7ad9",
+      "address": "0x1a2EB51a968436B003aA15F76db4eD56b01874F3",
+      "txHash": "0x469a0d80c0ca04599ad254e4cf45ba731f43d56cf2fc46f1b31c4a9d3eb2b300",
       "kind": "uups"
     },
     {
-      "address": "0xC3638588270e4a8f3A4036913e1CC4D4B7fbf12D",
-      "txHash": "0xd5d903678a158874d2d9342c5c231700a37de87f600d3093c64d9608ac2cee5f",
+      "address": "0xFa6236D6b2C432270eC9833AFD082aD335202d19",
+      "txHash": "0xa81b61dd98ca64dac93929af2e55a4af3e2a0d621490e477ab09329a6794ac0e",
       "kind": "uups"
     },
     {
-      "address": "0x3738320d5d49FD6F071b776a8cdA665E791Bc688",
-      "txHash": "0x0be61cedf11ac7c328ca9325e9b4589510e064e605d6c05de7bf438eb6ea4bf9",
+      "address": "0x3Fdc3304C14abBCbeDD245fBad696f6B7dfFAC16",
+      "txHash": "0xe84a1dc2cbd07e827c8dae1da9b33a2d5e5d1eac6454c537c6075f59f08737c3",
+      "kind": "uups"
+    },
+    {
+      "address": "0xc1e14E9c3B767DbbBf15fB954b7009b0a6F3abC8",
+      "txHash": "0xed4013495ae33835685aee7caeb4ea5a35aa3a30cacae99ff94ccb44102b968c",
+      "kind": "uups"
+    },
+    {
+      "address": "0x8496c5C441Ea8f34396E6079608D87469088faF8",
+      "txHash": "0xca290618e656f6139f5608b5774217c7935bfcc607a38401266411e22071942c",
+      "kind": "uups"
+    },
+    {
+      "address": "0x8bA21B0ed0b4b60B799671Cb434D171c11601E18",
+      "txHash": "0xf4bdf2412da0ad06a310c89edf5a415c9e110eb6e9e5b3ad450ea485b4429af8",
+      "kind": "uups"
+    },
+    {
+      "address": "0x5ABf2A7e1f421fC4e0fAdB8561A300e32A8C9089",
+      "txHash": "0xba99b4b905fecc4395babfa3c497fb9847ceb67455ed350d716037b3adad1804",
       "kind": "uups"
     },
     {
       "address": "0x448F7501EB66cB31DD83e0fEa20E828c838f7CDc",
-      "txHash": "0x0bd2e8ee0512f544b0eb273c929ab625b4cb0b5e129a25a9d57160f3399a9dbc",
+      "txHash": "0xc613be29ee43d62062c9f1be9c049119d31201b8a0bb420ae427c03aa02de273",
       "kind": "uups"
     },
     {
-      "address": "0x9273966dFc2FC57C309bB5508dbC3aaD3C85B9CE",
-      "txHash": "0x13866869ba12fd3fd63c764c1528cd5a0915cb25e39d8662d5f83175adbaf81e",
+      "address": "0x096e66a3Baba882Bad0EEc677fF48549BD06a920",
+      "txHash": "0xccaf22685bb147ae2bbcec7581828562c65932eaf9c2527b148794c671ce6228",
       "kind": "uups"
     },
     {
-      "address": "0xEA46711daF379025c4819Eb1028A00310d639594",
-      "txHash": "0x6aa62efe24d5b96139d4a30ec01cc2d00537a961cee35e30a84638ea2ea1caa5",
+      "address": "0x606EF38d0b8D2eD2c19C230313Ec6A6A17C52d94",
+      "txHash": "0x36d705fa6e5603bc7b50737f3be4076587c4f580c375f854d2da678f8780f098",
       "kind": "uups"
     },
     {
-      "address": "0x3088770F9419D1a149Fc29B5Dbd381aC1c2A49c3",
-      "txHash": "0x829c3112fdb20ef62861552905a9e617ac0422e4caa18c4ca14b942b8ccab064",
+      "address": "0x9367c36890Add4DcC03dF798e360c5cA288180Ff",
+      "txHash": "0x90659a5b32e91d5a393fa136e391fb573354f0b1b97d8573e79db42bf327f1f6",
       "kind": "uups"
     },
     {
-      "address": "0x87C0911EeBfB0B4f65AeD1C39813866a14c80637",
-      "txHash": "0x7f47bfc3db6902a710954094f8bcfae185334b2228d1a1a96ba760fab374294d",
+      "address": "0x8272772dAE72a44E6bcD1056b7D40607EBebc65c",
+      "txHash": "0x488782ca2632d3f02456d334405bbc5ef5b0ed06512f6f553923eb36d58c55c1",
       "kind": "uups"
     },
     {
-      "address": "0x31859953a33b8CD839D508bfc8461b6583ac9191",
-      "txHash": "0xba27d94d5df892aa07ae1babbd5cab676b2fe208efdb4ac30d79790f3d9bab74",
+      "address": "0x6fcB18fC636516F43a8DC5682dEcFEA76EF777FE",
+      "txHash": "0x37925ce49fcb54961d02b5226dae59d6abc2caed135540a71967fb81e5b81a0d",
       "kind": "uups"
     },
     {
-      "address": "0x3CEDFfB91cc162CA9e3dccB0215841EeC03Caf01",
-      "txHash": "0x1b33a12cf61ee4da888c3794506624d5a27d3ede46c041470c4ea950a2f7686c",
+      "address": "0x5583BDfEE186eD83FaD30C517403aDc68202B3bB",
+      "txHash": "0x67fc835e492702f458728aec625d707c53a9947676df58438df771d8824c0296",
       "kind": "uups"
     },
     {
-      "address": "0x8953343Ef1160695aAe2E0e76413202b8f405B41",
-      "txHash": "0xe5892762c2a4dcbe7ee90fe20f725eaa8d826c124e44bb38bc095f70aeffbc86",
+      "address": "0x988914A8564AC9f4a49173d8BDceb7f77a931FAE",
+      "txHash": "0xa9f090f1480002566cdf77b41c1de58b3e4fbeb24238a51a1e43144e6058f1e2",
       "kind": "uups"
-    }
-  ],
-  "impls": {
-    "6c4d42df69f915d010979911b0b3b1b2a89cadb0e7c68fec28217668f3ba6af3": {
-      "address": "0x26fD9cEDBDD5eA5daDBfF9C94D92786B48F09Eaa",
-      "txHash": "0x25b101261bb52e0437322bf6843dea01a81937efd53f31704b6a43ea8baf53a6",
-      "layout": {
-        "solcVersion": "0.8.17",
-        "storage": [
-          {
-            "label": "_initialized",
-            "offset": 0,
-            "slot": "0",
-            "type": "t_uint8",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
-            "retypedFrom": "bool"
-          },
-          {
-            "label": "_initializing",
-            "offset": 1,
-            "slot": "0",
-            "type": "t_bool",
-            "contract": "Initializable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "1",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ERC165Upgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
-          },
-          {
-            "label": "_supportedInterfaces",
-            "offset": 0,
-            "slot": "51",
-            "type": "t_mapping(t_bytes4,t_bool)",
-            "contract": "ERC165StorageUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165StorageUpgradeable.sol:24"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "52",
-            "type": "t_array(t_uint256)49_storage",
-            "contract": "ERC165StorageUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165StorageUpgradeable.sol:54"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "101",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "ERC1967UpgradeUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
-          },
-          {
-            "label": "__gap",
-            "offset": 0,
-            "slot": "151",
-            "type": "t_array(t_uint256)50_storage",
-            "contract": "UUPSUpgradeable",
-            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
-          },
-          {
+    },
+    {
+      "address": "0x4D922E01f20326f9228A78BAE1990D8241c56e1E",
+      "txHash": "0xfcc0148fae519684c438e1055ff4b89e673afdea7244b1b0d1daa501d3f83774",
+      "kind": "uups"
+    },
+    {
+      "address": "0xF6339c755D0390780ACA047bFbEDbf06d0e8944B",
+      "txHash": "0xd12785ef24ec2b7188b338f8b38e7eec7ed05780ed5f99a53424e97293957636",
+      "kind": "uups"
+    },
+    {
+      "address": "0x46f2B60D579E0E1049Ce25bC8356164349Df78C2",
+      "txHash": "0x5eff8047faa6e6b20dfc473274af8aaf3d567186c57bd09426ccb5e5430c8293",
+      "kind": "uups"
+    },
+    {
+      "address": "0x911F6D6c7Bd4e9EC33133c961885D68173428Be5",
+      "txHash": "0xf392532bfefd96f37fad065aef0c973577e0377a4cd5d6f5336f5408661ed119",
+      "kind": "uups"
+    },
+    {
+      "address": "0xE5677fB8b3f5b94DB468969d649113d3353E8C60",
+      "txHash": "0x62c5a4e7d733935ee7c8616a9822ab76331ad5645035f48639632833e0810eb5",
+      "kind": "uups"
+    },
+    {
+      "address": "0x8dbCAe9D2223A47420B97233D8a5efd11362Ad83",
+      "txHash": "0xcd8ce3e0a177440f3da1c5afffbe8f7076bbcad5e507c6dbe2ff5eff9e03d9d5",
+      "kind": "uups"
+    },
+    {
+      "address": "0xf42B5f49289931842ae1EdC2816B0D167E80c830",
+      "txHash": "0xd6ee8330335914307c1290f73e6770cb42814ae4edf4367643c1c76040e39f7e",
+      "kind": "uups"
+    },
+    {
+      "address": "0x541840391d15930dc109A3De3131b112B285ba73",
+      "txHash": "0x29125e589d76166825cbf78bbcf0c150062d173a3c523d0afc9d9946e8ed822b",
+      "kind": "uups"
+    },
+    {
+      "address": "0x50e1F64A81F7D88213E6912b71cb60af5bD0b701",
+      "txHash": "0x2e7ae9b644a8351950c6072d127acdc6da156e98bfb813ca825b5187395c3139",
+      "kind": "uups"
+    },
+    {
+      "address": "0x49Db64E11A5253fdba6C72C9DEE2E9432644376c",
+      "txHash": "0x31c5d40a676550aa2fa6717efc7cd2075cb4dd297f216baad10ef44c8cacb6dc",
+      "kind": "uups"
+    },
+    {
+      "address": "0xdBb5bfb00f92d61dC565A5Abcf0a84E96B599089",
+      "txHash": "0xccfa90e14c0a7aff090ccc2b54aa3fce401708aa166ab20174267b0a25c9b790",
+      "kind": "uups"
+    },
+    {
+      "address": "0x8A3Ae795bE69470927D9527FEFB68C0a90c10e15",
+      "txHash": "0x32c96fa14d0b3cc175484ad2c146b562cd0f01908d40646944e8cfdf3e9df39b",
+      "kind": "uups"
+    },
+    {
+      "address": "0x59897a1d8086fDD7Ac07026F769ebd4091c7E944",
+      "txHash": "0x0ad1100574375db7a71dc0ff1b970a8725d47b592295c47f7b5919bf08724a72",
+      "kind": "uups"
+    },
+    {
+      "address": "0xf5e5C4A4f49Bd23dD11188391BaE6c551e3B0C73",
+      "txHash": "0x3d47e8f96a4e9a6cb83bca9c7de236de4baa6dc6f468201dfbb168140c6cbec9",
+      "kind": "uups"
+    },
+    {
+      "address": "0x9dfdf66813E318e2392C7833037ed2D0429eeccF",
+      "txHash": "0x8f4a5d6eaac818a062d066e91c1b07ebd8c08e05d567fce7e38f6b88cd2137b7",
+      "kind": "uups"
+    },
+    {
+      "address": "0xD25A231f9f705476B4869Bf03c973f11462C605D",
+      "txHash": "0x8038fe8be215683d80176d93cb91f95ea0a4601327099250436b96b9a6f0f752",
+      "kind": "uups"
+    },
+    {
+      "address": "0x04f130A93ebd3fEA7ada6f4e0AdB65D8AdAee814",
+      "txHash": "0x1fdf96a2fe209d80ff43cacbe4eb002579e460dfbac1f95d7e9363bab70e492f",
+      "kind": "uups"
+    },
+    {
+      "address": "0x9273966dFc2FC57C309bB5508dbC3aaD3C85B9CE",
+      "txHash": "0x3ac53a095448832082cbf588a233a117f930da7cd68d00237d625e6b4a995767",
+      "kind": "uups"
+    },
+    {
+      "address": "0xC2B8E3DB8db4266Dd910B214294F7E5a331489Ff",
+      "txHash": "0xb12bea1b1c78fcd2a5c7aa30baa2f87a3a8694166c11f53df7c33cdfd7852ed7",
+      "kind": "uups"
+    },
+    {
+      "address": "0x275416d9E7464D7341127Ef96ad51513e4ce554d",
+      "txHash": "0x24af51ada0a08f6cc0d07b818ce440d8191742488b7611cd2c95be245d4a2926",
+      "kind": "uups"
+    },
+    {
+      "address": "0x2dc0d912945B5A5FCd74909CB6A5c6674524508f",
+      "txHash": "0xd4d6a9126dcfdf39add986e7abf16c89ede5e070fb54a48714560938b11ab0cb",
+      "kind": "uups"
+    },
+    {
+      "address": "0x55f9f63B14b98E9181FAcB00F3920A258cAD58dD",
+      "txHash": "0x16edfe66ddc66771167c1e699bc063058cb77ccec40c1d4cfbefb9e5de7dcbb4",
+      "kind": "uups"
+    },
+    {
+      "address": "0x865c1CadDedB978bD5E1405ea453e8c550882d68",
+      "txHash": "0x6fea8331f19578dbae35ad2df3d1d2e7e88b8daa380fb410afd0d09812cf80e9",
+      "kind": "uups"
+    },
+    {
+      "address": "0x84AA32ecA24991d059001591A417793da00627b4",
+      "txHash": "0x1915e9d94719a4a9e7473451fc4a91dd1e41d585e5946797c934181a000debdf",
+      "kind": "uups"
+    },
+    {
+      "address": "0x26EB7E3f8B0453d779BB846Ebc7c59AC6Cc20dCD",
+      "txHash": "0xa3bcb86ea907ab1faa3b3fd36f10ab2312b2ac9cd06efafcbd802f0880b08b45",
+      "kind": "uups"
+    },
+    {
+      "address": "0x75Df8C6196B442DE497F25575C681C75fb30f07B",
+      "txHash": "0x9e7fedb2b5c8d563f8cd5daf3876b2c5a4e57548b63e3f2e4d67bde0a83c07f2",
+      "kind": "uups"
+    },
+    {
+      "address": "0x4d9DCb37Dfbba4CaaF662305825c314EFf1473ac",
+      "txHash": "0xffc9b38fc60743af4ddcdfc7ac4256694fe0b5be6d336b520383490e62adf58b",
+      "kind": "uups"
+    },
+    {
+      "address": "0x3Fa04BbAF2963570F07f4FB1F29308BA4415D799",
+      "txHash": "0x76b9ba9d9e6cbb014c84ff76a0dc6fe4a5831a9dba6b8c740d51117755ad3972",
+      "kind": "uups"
+    }
+  ],
+  "impls": {
+    "6c4d42df69f915d010979911b0b3b1b2a89cadb0e7c68fec28217668f3ba6af3": {
+      "address": "0x0e4FA25867400d5De4D5899aEEC7c8B1A0d125f3",
+      "txHash": "0x8aea783f0f16caeca5cccb426c4fa6c391eb8fb043d4ac34279051ad5a4b4d3a",
+      "layout": {
+        "solcVersion": "0.8.17",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC165Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
+          },
+          {
+            "label": "_supportedInterfaces",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_mapping(t_bytes4,t_bool)",
+            "contract": "ERC165StorageUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165StorageUpgradeable.sol:24"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "52",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "ERC165StorageUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165StorageUpgradeable.sol:54"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC1967UpgradeUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UUPSUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
+          },
+          {
             "label": "permissionsHashed",
             "offset": 0,
             "slot": "201",
@@ -3815,18 +3820,1572 @@
             "label": "mapping(bytes4 => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes4,t_bytes4)": {
-            "label": "mapping(bytes4 => bytes4)",
-            "numberOfBytes": "32"
+          "t_mapping(t_bytes4,t_bytes4)": {
+            "label": "mapping(bytes4 => bytes4)",
+            "numberOfBytes": "32"
+          },
+          "t_string_storage": {
+            "label": "string",
+            "numberOfBytes": "32"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
+    },
+    "a0137fad191e23f7e912f57d9be664b41f3147ee5a91f411b30fb26bc4f9014f": {
+      "address": "0x66F2BcfD9fa1d5D48929A9D230405A47699eD92C",
+      "txHash": "0x3f0985361c59e3d4ffe247da86d3c235855e1557d4f7bcb4867752dd1ae0cb59",
+      "layout": {
+        "solcVersion": "0.8.17",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC165Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC1967UpgradeUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UUPSUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "dao_",
+            "offset": 0,
+            "slot": "201",
+            "type": "t_contract(IDAO)8421",
+            "contract": "DaoAuthorizableUpgradeable",
+            "src": "@xinfin/osx/core/plugin/dao-authorizable/DaoAuthorizableUpgradeable.sol:16"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "202",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "DaoAuthorizableUpgradeable",
+            "src": "@xinfin/osx/core/plugin/dao-authorizable/DaoAuthorizableUpgradeable.sol:38"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "251",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "PluginUUPSUpgradeable",
+            "src": "@xinfin/osx/core/plugin/PluginUUPSUpgradeable.sol:66"
+          },
+          {
+            "label": "proposalCounter",
+            "offset": 0,
+            "slot": "301",
+            "type": "t_struct(Counter)3259_storage",
+            "contract": "ProposalUpgradeable",
+            "src": "@xinfin/osx/core/plugin/proposal/ProposalUpgradeable.sol:17"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "302",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "ProposalUpgradeable",
+            "src": "@xinfin/osx/core/plugin/proposal/ProposalUpgradeable.sol:83"
+          },
+          {
+            "label": "lastProposalBlockNumber",
+            "offset": 0,
+            "slot": "351",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:126"
+          },
+          {
+            "label": "_daofinGlobalSettings",
+            "offset": 0,
+            "slot": "352",
+            "type": "t_struct(DaofinGlobalSettings)18491_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:128"
+          },
+          {
+            "label": "_proposals",
+            "offset": 0,
+            "slot": "354",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18550_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:131"
+          },
+          {
+            "label": "_committeesToVotingSettings",
+            "offset": 0,
+            "slot": "355",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18502_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:137"
+          },
+          {
+            "label": "_committeesToTallyDetails",
+            "offset": 0,
+            "slot": "356",
+            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18528_storage))",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:143"
+          },
+          {
+            "label": "_voterToLockedAmounts",
+            "offset": 0,
+            "slot": "357",
+            "type": "t_mapping(t_address,t_uint256)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:149"
+          },
+          {
+            "label": "_votersToPropsalIds",
+            "offset": 0,
+            "slot": "358",
+            "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:152"
+          },
+          {
+            "label": "_judiciaryCommittee",
+            "offset": 0,
+            "slot": "359",
+            "type": "t_mapping(t_address,t_bool)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:157"
+          },
+          {
+            "label": "_committeesList",
+            "offset": 0,
+            "slot": "360",
+            "type": "t_array(t_bytes32)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:160"
+          },
+          {
+            "label": "_electionPeriods",
+            "offset": 0,
+            "slot": "361",
+            "type": "t_array(t_struct(ElectionPeriod)18562_storage)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:163"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_address)dyn_storage": {
+            "label": "address[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_bytes32)dyn_storage": {
+            "label": "bytes32[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_struct(Action)8275_storage)dyn_storage": {
+            "label": "struct IDAO.Action[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_struct(ElectionPeriod)18562_storage)dyn_storage": {
+            "label": "struct DaofinPlugin.ElectionPeriod[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]",
+            "numberOfBytes": "1568"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_array(t_uint256)dyn_storage": {
+            "label": "uint256[]",
+            "numberOfBytes": "32"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_bytes32": {
+            "label": "bytes32",
+            "numberOfBytes": "32"
+          },
+          "t_bytes_storage": {
+            "label": "bytes",
+            "numberOfBytes": "32"
+          },
+          "t_contract(IDAO)8421": {
+            "label": "contract IDAO",
+            "numberOfBytes": "20"
+          },
+          "t_contract(IXDCValidator)20055": {
+            "label": "contract IXDCValidator",
+            "numberOfBytes": "20"
+          },
+          "t_enum(VoteOption)18484": {
+            "label": "enum DaofinPlugin.VoteOption",
+            "members": [
+              "None",
+              "Abstain",
+              "Yes",
+              "No"
+            ],
+            "numberOfBytes": "1"
+          },
+          "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
+            "label": "mapping(address => uint256[])",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_bool)": {
+            "label": "mapping(address => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_struct(VoteInfo)18508_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_uint256)": {
+            "label": "mapping(address => uint256)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18528_storage))": {
+            "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18502_storage)": {
+            "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18550_storage)": {
+            "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(TallyDatails)18528_storage)": {
+            "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
+            "numberOfBytes": "32"
+          },
+          "t_struct(Action)8275_storage": {
+            "label": "struct IDAO.Action",
+            "members": [
+              {
+                "label": "to",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "data",
+                "type": "t_bytes_storage",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(CommitteeVotingSettings)18502_storage": {
+            "label": "struct DaofinPlugin.CommitteeVotingSettings",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "supportThreshold",
+                "type": "t_uint32",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "minParticipation",
+                "type": "t_uint32",
+                "offset": 4,
+                "slot": "1"
+              },
+              {
+                "label": "minDuration",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "1"
+              },
+              {
+                "label": "minVotingPower",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(Counter)3259_storage": {
+            "label": "struct CountersUpgradeable.Counter",
+            "members": [
+              {
+                "label": "_value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(DaofinGlobalSettings)18491_storage": {
+            "label": "struct DaofinPlugin.DaofinGlobalSettings",
+            "members": [
+              {
+                "label": "xdcValidator",
+                "type": "t_contract(IXDCValidator)20055",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "allowedAmounts",
+                "type": "t_array(t_uint256)dyn_storage",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(ElectionPeriod)18562_storage": {
+            "label": "struct DaofinPlugin.ElectionPeriod",
+            "members": [
+              {
+                "label": "startDate",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(Proposal)18550_storage": {
+            "label": "struct DaofinPlugin.Proposal",
+            "members": [
+              {
+                "label": "executed",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "parameters",
+                "type": "t_struct(ProposalParameters)18557_storage",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "proposer",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18508_storage)",
+                "offset": 0,
+                "slot": "3"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
+                "offset": 0,
+                "slot": "4"
+              },
+              {
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "offset": 0,
+                "slot": "5"
+              },
+              {
+                "label": "allowFailureMap",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "6"
+              }
+            ],
+            "numberOfBytes": "224"
+          },
+          "t_struct(ProposalParameters)18557_storage": {
+            "label": "struct DaofinPlugin.ProposalParameters",
+            "members": [
+              {
+                "label": "startDate",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "0"
+              },
+              {
+                "label": "snapshotBlock",
+                "type": "t_uint64",
+                "offset": 16,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(TallyDatails)18528_storage": {
+            "label": "struct DaofinPlugin.TallyDatails",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "abstain",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "yes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "no",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
+              }
+            ],
+            "numberOfBytes": "128"
+          },
+          "t_struct(VoteInfo)18508_storage": {
+            "label": "struct DaofinPlugin.VoteInfo",
+            "members": [
+              {
+                "label": "voted",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "option",
+                "type": "t_enum(VoteOption)18484",
+                "offset": 1,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint32": {
+            "label": "uint32",
+            "numberOfBytes": "4"
+          },
+          "t_uint64": {
+            "label": "uint64",
+            "numberOfBytes": "8"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
+    },
+    "ebc0d0b5a271079536bdc7806ac3e2b2a9a7877382a02f726cd332dfe6837baf": {
+      "address": "0xB377a2EeD7566Ac9fCb0BA673604F9BF875e2Bab",
+      "txHash": "0xfb26566a17b2d8f505b8c018f2be6cabab06ad9ac0f4967f76e99d357772de1a",
+      "layout": {
+        "solcVersion": "0.8.17",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC165Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC1967UpgradeUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UUPSUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "dao_",
+            "offset": 0,
+            "slot": "201",
+            "type": "t_contract(IDAO)8421",
+            "contract": "DaoAuthorizableUpgradeable",
+            "src": "@xinfin/osx/core/plugin/dao-authorizable/DaoAuthorizableUpgradeable.sol:16"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "202",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "DaoAuthorizableUpgradeable",
+            "src": "@xinfin/osx/core/plugin/dao-authorizable/DaoAuthorizableUpgradeable.sol:38"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "251",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "PluginUUPSUpgradeable",
+            "src": "@xinfin/osx/core/plugin/PluginUUPSUpgradeable.sol:66"
+          },
+          {
+            "label": "proposalCounter",
+            "offset": 0,
+            "slot": "301",
+            "type": "t_struct(Counter)3259_storage",
+            "contract": "ProposalUpgradeable",
+            "src": "@xinfin/osx/core/plugin/proposal/ProposalUpgradeable.sol:17"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "302",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "ProposalUpgradeable",
+            "src": "@xinfin/osx/core/plugin/proposal/ProposalUpgradeable.sol:83"
+          },
+          {
+            "label": "lastProposalBlockNumber",
+            "offset": 0,
+            "slot": "351",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:127"
+          },
+          {
+            "label": "_daofinGlobalSettings",
+            "offset": 0,
+            "slot": "352",
+            "type": "t_struct(DaofinGlobalSettings)18497_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:129"
+          },
+          {
+            "label": "_proposals",
+            "offset": 0,
+            "slot": "354",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18556_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:132"
+          },
+          {
+            "label": "_committeesToVotingSettings",
+            "offset": 0,
+            "slot": "355",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:138"
+          },
+          {
+            "label": "_committeesToTallyDetails",
+            "offset": 0,
+            "slot": "356",
+            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:144"
+          },
+          {
+            "label": "_voterToLockedAmounts",
+            "offset": 0,
+            "slot": "357",
+            "type": "t_mapping(t_address,t_uint256)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:150"
+          },
+          {
+            "label": "_votersToPropsalIds",
+            "offset": 0,
+            "slot": "358",
+            "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:153"
+          },
+          {
+            "label": "_judiciaryCommittee",
+            "offset": 0,
+            "slot": "359",
+            "type": "t_mapping(t_address,t_bool)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:158"
+          },
+          {
+            "label": "_committeesList",
+            "offset": 0,
+            "slot": "360",
+            "type": "t_array(t_bytes32)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:161"
+          },
+          {
+            "label": "_electionPeriods",
+            "offset": 0,
+            "slot": "361",
+            "type": "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:164"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_address)dyn_storage": {
+            "label": "address[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_bytes32)dyn_storage": {
+            "label": "bytes32[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_struct(Action)8275_storage)dyn_storage": {
+            "label": "struct IDAO.Action[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage": {
+            "label": "struct DaofinPlugin.ElectionPeriod[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]",
+            "numberOfBytes": "1568"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_array(t_uint256)dyn_storage": {
+            "label": "uint256[]",
+            "numberOfBytes": "32"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_bytes32": {
+            "label": "bytes32",
+            "numberOfBytes": "32"
+          },
+          "t_bytes_storage": {
+            "label": "bytes",
+            "numberOfBytes": "32"
+          },
+          "t_contract(IDAO)8421": {
+            "label": "contract IDAO",
+            "numberOfBytes": "20"
+          },
+          "t_contract(IXDCValidator)20066": {
+            "label": "contract IXDCValidator",
+            "numberOfBytes": "20"
+          },
+          "t_enum(VoteOption)18490": {
+            "label": "enum DaofinPlugin.VoteOption",
+            "members": [
+              "None",
+              "Abstain",
+              "Yes",
+              "No"
+            ],
+            "numberOfBytes": "1"
+          },
+          "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
+            "label": "mapping(address => uint256[])",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_bool)": {
+            "label": "mapping(address => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_struct(VoteInfo)18514_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_uint256)": {
+            "label": "mapping(address => uint256)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))": {
+            "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)": {
+            "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18556_storage)": {
+            "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(TallyDatails)18534_storage)": {
+            "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
+            "numberOfBytes": "32"
+          },
+          "t_struct(Action)8275_storage": {
+            "label": "struct IDAO.Action",
+            "members": [
+              {
+                "label": "to",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "data",
+                "type": "t_bytes_storage",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(CommitteeVotingSettings)18508_storage": {
+            "label": "struct DaofinPlugin.CommitteeVotingSettings",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "supportThreshold",
+                "type": "t_uint32",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "minParticipation",
+                "type": "t_uint32",
+                "offset": 4,
+                "slot": "1"
+              },
+              {
+                "label": "minDuration",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "1"
+              },
+              {
+                "label": "minVotingPower",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(Counter)3259_storage": {
+            "label": "struct CountersUpgradeable.Counter",
+            "members": [
+              {
+                "label": "_value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(DaofinGlobalSettings)18497_storage": {
+            "label": "struct DaofinPlugin.DaofinGlobalSettings",
+            "members": [
+              {
+                "label": "xdcValidator",
+                "type": "t_contract(IXDCValidator)20066",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "allowedAmounts",
+                "type": "t_array(t_uint256)dyn_storage",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(ElectionPeriod)18568_storage": {
+            "label": "struct DaofinPlugin.ElectionPeriod",
+            "members": [
+              {
+                "label": "startDate",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(Proposal)18556_storage": {
+            "label": "struct DaofinPlugin.Proposal",
+            "members": [
+              {
+                "label": "executed",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "parameters",
+                "type": "t_struct(ProposalParameters)18563_storage",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "proposer",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18514_storage)",
+                "offset": 0,
+                "slot": "3"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
+                "offset": 0,
+                "slot": "4"
+              },
+              {
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "offset": 0,
+                "slot": "5"
+              },
+              {
+                "label": "allowFailureMap",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "6"
+              }
+            ],
+            "numberOfBytes": "224"
+          },
+          "t_struct(ProposalParameters)18563_storage": {
+            "label": "struct DaofinPlugin.ProposalParameters",
+            "members": [
+              {
+                "label": "startDate",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "0"
+              },
+              {
+                "label": "snapshotBlock",
+                "type": "t_uint64",
+                "offset": 16,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(TallyDatails)18534_storage": {
+            "label": "struct DaofinPlugin.TallyDatails",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "abstain",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "yes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "no",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
+              }
+            ],
+            "numberOfBytes": "128"
+          },
+          "t_struct(VoteInfo)18514_storage": {
+            "label": "struct DaofinPlugin.VoteInfo",
+            "members": [
+              {
+                "label": "voted",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "option",
+                "type": "t_enum(VoteOption)18490",
+                "offset": 1,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint32": {
+            "label": "uint32",
+            "numberOfBytes": "4"
+          },
+          "t_uint64": {
+            "label": "uint64",
+            "numberOfBytes": "8"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
+    },
+    "5afc849f9992c96802be2ae12e673b03b6bcb59be5c137749f9a516d0b08d29d": {
+      "address": "0xab16A69A5a8c12C732e0DEFF4BE56A70bb64c926",
+      "txHash": "0x38b68891a7f7057a6717316b14cb7b27a67c1b05f9df6caa0dc32e3a7c70d4cb",
+      "layout": {
+        "solcVersion": "0.8.17",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC165Upgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ERC1967UpgradeUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "UUPSUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "151",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "dao_",
+            "offset": 0,
+            "slot": "201",
+            "type": "t_contract(IDAO)8421",
+            "contract": "DaoAuthorizableUpgradeable",
+            "src": "@xinfin/osx/core/plugin/dao-authorizable/DaoAuthorizableUpgradeable.sol:16"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "202",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "DaoAuthorizableUpgradeable",
+            "src": "@xinfin/osx/core/plugin/dao-authorizable/DaoAuthorizableUpgradeable.sol:38"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "251",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "PluginUUPSUpgradeable",
+            "src": "@xinfin/osx/core/plugin/PluginUUPSUpgradeable.sol:66"
+          },
+          {
+            "label": "proposalCounter",
+            "offset": 0,
+            "slot": "301",
+            "type": "t_struct(Counter)3259_storage",
+            "contract": "ProposalUpgradeable",
+            "src": "@xinfin/osx/core/plugin/proposal/ProposalUpgradeable.sol:17"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "302",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "ProposalUpgradeable",
+            "src": "@xinfin/osx/core/plugin/proposal/ProposalUpgradeable.sol:83"
+          },
+          {
+            "label": "lastProposalBlockNumber",
+            "offset": 0,
+            "slot": "351",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:127"
+          },
+          {
+            "label": "_daofinGlobalSettings",
+            "offset": 0,
+            "slot": "352",
+            "type": "t_struct(DaofinGlobalSettings)18497_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:129"
+          },
+          {
+            "label": "_proposals",
+            "offset": 0,
+            "slot": "354",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18556_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:132"
+          },
+          {
+            "label": "_committeesToVotingSettings",
+            "offset": 0,
+            "slot": "355",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:138"
+          },
+          {
+            "label": "_committeesToTallyDetails",
+            "offset": 0,
+            "slot": "356",
+            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:144"
+          },
+          {
+            "label": "_voterToLockedAmounts",
+            "offset": 0,
+            "slot": "357",
+            "type": "t_mapping(t_address,t_uint256)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:150"
+          },
+          {
+            "label": "_votersToPropsalIds",
+            "offset": 0,
+            "slot": "358",
+            "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:153"
+          },
+          {
+            "label": "_judiciaryCommittee",
+            "offset": 0,
+            "slot": "359",
+            "type": "t_mapping(t_address,t_bool)",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:158"
+          },
+          {
+            "label": "_committeesList",
+            "offset": 0,
+            "slot": "360",
+            "type": "t_array(t_bytes32)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:161"
+          },
+          {
+            "label": "_electionPeriods",
+            "offset": 0,
+            "slot": "361",
+            "type": "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:164"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_address)dyn_storage": {
+            "label": "address[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_bytes32)dyn_storage": {
+            "label": "bytes32[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_struct(Action)8275_storage)dyn_storage": {
+            "label": "struct IDAO.Action[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage": {
+            "label": "struct DaofinPlugin.ElectionPeriod[]",
+            "numberOfBytes": "32"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]",
+            "numberOfBytes": "1568"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_array(t_uint256)dyn_storage": {
+            "label": "uint256[]",
+            "numberOfBytes": "32"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_bytes32": {
+            "label": "bytes32",
+            "numberOfBytes": "32"
+          },
+          "t_bytes_storage": {
+            "label": "bytes",
+            "numberOfBytes": "32"
+          },
+          "t_contract(IDAO)8421": {
+            "label": "contract IDAO",
+            "numberOfBytes": "20"
+          },
+          "t_contract(IXDCValidator)20070": {
+            "label": "contract IXDCValidator",
+            "numberOfBytes": "20"
+          },
+          "t_enum(VoteOption)18490": {
+            "label": "enum DaofinPlugin.VoteOption",
+            "members": [
+              "None",
+              "Abstain",
+              "Yes",
+              "No"
+            ],
+            "numberOfBytes": "1"
+          },
+          "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
+            "label": "mapping(address => uint256[])",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_bool)": {
+            "label": "mapping(address => bool)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_struct(VoteInfo)18514_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_address,t_uint256)": {
+            "label": "mapping(address => uint256)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))": {
+            "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)": {
+            "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18556_storage)": {
+            "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(TallyDatails)18534_storage)": {
+            "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
+            "numberOfBytes": "32"
+          },
+          "t_struct(Action)8275_storage": {
+            "label": "struct IDAO.Action",
+            "members": [
+              {
+                "label": "to",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "data",
+                "type": "t_bytes_storage",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(CommitteeVotingSettings)18508_storage": {
+            "label": "struct DaofinPlugin.CommitteeVotingSettings",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "supportThreshold",
+                "type": "t_uint32",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "minParticipation",
+                "type": "t_uint32",
+                "offset": 4,
+                "slot": "1"
+              },
+              {
+                "label": "minDuration",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "1"
+              },
+              {
+                "label": "minVotingPower",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(Counter)3259_storage": {
+            "label": "struct CountersUpgradeable.Counter",
+            "members": [
+              {
+                "label": "_value",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(DaofinGlobalSettings)18497_storage": {
+            "label": "struct DaofinPlugin.DaofinGlobalSettings",
+            "members": [
+              {
+                "label": "xdcValidator",
+                "type": "t_contract(IXDCValidator)20070",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "allowedAmounts",
+                "type": "t_array(t_uint256)dyn_storage",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(ElectionPeriod)18568_storage": {
+            "label": "struct DaofinPlugin.ElectionPeriod",
+            "members": [
+              {
+                "label": "startDate",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(Proposal)18556_storage": {
+            "label": "struct DaofinPlugin.Proposal",
+            "members": [
+              {
+                "label": "executed",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "parameters",
+                "type": "t_struct(ProposalParameters)18563_storage",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "proposer",
+                "type": "t_address",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18514_storage)",
+                "offset": 0,
+                "slot": "3"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
+                "offset": 0,
+                "slot": "4"
+              },
+              {
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "offset": 0,
+                "slot": "5"
+              },
+              {
+                "label": "allowFailureMap",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "6"
+              }
+            ],
+            "numberOfBytes": "224"
+          },
+          "t_struct(ProposalParameters)18563_storage": {
+            "label": "struct DaofinPlugin.ProposalParameters",
+            "members": [
+              {
+                "label": "startDate",
+                "type": "t_uint64",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "0"
+              },
+              {
+                "label": "snapshotBlock",
+                "type": "t_uint64",
+                "offset": 16,
+                "slot": "0"
+              }
+            ],
+            "numberOfBytes": "32"
+          },
+          "t_struct(TallyDatails)18534_storage": {
+            "label": "struct DaofinPlugin.TallyDatails",
+            "members": [
+              {
+                "label": "name",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "abstain",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "yes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "no",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
+              }
+            ],
+            "numberOfBytes": "128"
           },
-          "t_string_storage": {
-            "label": "string",
+          "t_struct(VoteInfo)18514_storage": {
+            "label": "struct DaofinPlugin.VoteInfo",
+            "members": [
+              {
+                "label": "voted",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "option",
+                "type": "t_enum(VoteOption)18490",
+                "offset": 1,
+                "slot": "0"
+              }
+            ],
             "numberOfBytes": "32"
           },
           "t_uint256": {
             "label": "uint256",
             "numberOfBytes": "32"
           },
+          "t_uint32": {
+            "label": "uint32",
+            "numberOfBytes": "4"
+          },
+          "t_uint64": {
+            "label": "uint64",
+            "numberOfBytes": "8"
+          },
           "t_uint8": {
             "label": "uint8",
             "numberOfBytes": "1"
@@ -3834,9 +5393,9 @@
         }
       }
     },
-    "a0137fad191e23f7e912f57d9be664b41f3147ee5a91f411b30fb26bc4f9014f": {
-      "address": "0x66F2BcfD9fa1d5D48929A9D230405A47699eD92C",
-      "txHash": "0x3f0985361c59e3d4ffe247da86d3c235855e1557d4f7bcb4867752dd1ae0cb59",
+    "c222f77af1421c4e3bf0123ebb60c9e72fa9da4a95f5fa98f67fdea4f86ab9f5": {
+      "address": "0xAA292E8611aDF267e563f334Ee42320aC96D0463",
+      "txHash": "0x58ae91ffdc113adfb2e58ebaf814962ab67fc9ec25fc5a07284a0e5667f9da58",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -3935,79 +5494,87 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:126"
+            "src": "src/DaofinPlugin.sol:142"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18491_storage",
+            "type": "t_struct(DaofinGlobalSettings)18443_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:128"
+            "src": "src/DaofinPlugin.sol:145"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "354",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18550_storage)",
+            "slot": "355",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18512_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:131"
+            "src": "src/DaofinPlugin.sol:148"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
-            "slot": "355",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18502_storage)",
+            "slot": "356",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:137"
+            "src": "src/DaofinPlugin.sol:154"
           },
           {
             "label": "_committeesToTallyDetails",
             "offset": 0,
-            "slot": "356",
-            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18528_storage))",
+            "slot": "357",
+            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:143"
+            "src": "src/DaofinPlugin.sol:160"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
-            "slot": "357",
-            "type": "t_mapping(t_address,t_uint256)",
+            "slot": "358",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:149"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
-            "label": "_votersToPropsalIds",
+            "label": "_votersToProposalIds",
             "offset": 0,
-            "slot": "358",
+            "slot": "359",
             "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:152"
+            "src": "src/DaofinPlugin.sol:172"
           },
           {
             "label": "_judiciaryCommittee",
             "offset": 0,
-            "slot": "359",
+            "slot": "360",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:157"
+            "src": "src/DaofinPlugin.sol:177"
+          },
+          {
+            "label": "_masterNodeDelegatee",
+            "offset": 0,
+            "slot": "361",
+            "type": "t_struct(MasterNodeDelegateeMappings)18540_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:182"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "360",
+            "slot": "364",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:160"
+            "src": "src/DaofinPlugin.sol:185"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
-            "slot": "361",
-            "type": "t_array(t_struct(ElectionPeriod)18562_storage)dyn_storage",
+            "slot": "365",
+            "type": "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:163"
+            "src": "src/DaofinPlugin.sol:188"
           }
         ],
         "types": {
@@ -4027,7 +5594,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18562_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -4059,11 +5626,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20055": {
+          "t_contract(IXDCValidator)20524": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18484": {
+          "t_enum(VoteOption)18434": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -4073,6 +5640,10 @@
             ],
             "numberOfBytes": "1"
           },
+          "t_mapping(t_address,t_address)": {
+            "label": "mapping(address => address)",
+            "numberOfBytes": "32"
+          },
           "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
             "label": "mapping(address => uint256[])",
             "numberOfBytes": "32"
@@ -4081,27 +5652,31 @@
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18508_storage)": {
-            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
+          "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_uint256)": {
-            "label": "mapping(address => uint256)",
+          "t_mapping(t_address,t_struct(VoteInfo)18460_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18528_storage))": {
+          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))": {
             "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18502_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18550_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)": {
+            "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18512_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(TallyDatails)18528_storage)": {
+          "t_mapping(t_uint256,t_struct(TallyDatails)18480_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
@@ -4129,7 +5704,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18502_storage": {
+          "t_struct(CommitteeVotingSettings)18454_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -4177,12 +5752,12 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18491_storage": {
+          "t_struct(DaofinGlobalSettings)18443_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20055",
+                "type": "t_contract(IXDCValidator)20524",
                 "offset": 0,
                 "slot": "0"
               },
@@ -4191,11 +5766,17 @@
                 "type": "t_array(t_uint256)dyn_storage",
                 "offset": 0,
                 "slot": "1"
+              },
+              {
+                "label": "totalNumberOfMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
               }
             ],
-            "numberOfBytes": "64"
+            "numberOfBytes": "96"
           },
-          "t_struct(ElectionPeriod)18562_storage": {
+          "t_struct(ElectionPeriod)18524_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -4213,7 +5794,31 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(Proposal)18550_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18540_storage": {
+            "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
+            "members": [
+              {
+                "label": "masterNodeToDelegatee",
+                "type": "t_mapping(t_address,t_address)",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "delegateeToMasterNode",
+                "type": "t_mapping(t_address,t_address)",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "lastModificationBlocknumber",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(Proposal)18512_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -4223,45 +5828,57 @@
                 "slot": "0"
               },
               {
-                "label": "parameters",
-                "type": "t_struct(ProposalParameters)18557_storage",
+                "label": "proposer",
+                "type": "t_address",
+                "offset": 1,
+                "slot": "0"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
                 "offset": 0,
                 "slot": "1"
               },
               {
-                "label": "proposer",
-                "type": "t_address",
+                "label": "allowFailureMap",
+                "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
               },
               {
-                "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18508_storage)",
+                "label": "parameters",
+                "type": "t_struct(ProposalParameters)18519_storage",
                 "offset": 0,
                 "slot": "3"
               },
               {
-                "label": "voters",
-                "type": "t_array(t_address)dyn_storage",
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
                 "offset": 0,
                 "slot": "4"
               },
               {
-                "label": "actions",
-                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18460_storage)",
                 "offset": 0,
                 "slot": "5"
               },
               {
-                "label": "allowFailureMap",
-                "type": "t_uint256",
+                "label": "committeeToVotingSettings",
+                "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
                 "offset": 0,
                 "slot": "6"
+              },
+              {
+                "label": "committeeToTallyDatails",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)",
+                "offset": 0,
+                "slot": "7"
               }
             ],
-            "numberOfBytes": "224"
+            "numberOfBytes": "256"
           },
-          "t_struct(ProposalParameters)18557_storage": {
+          "t_struct(ProposalParameters)18519_storage": {
             "label": "struct DaofinPlugin.ProposalParameters",
             "members": [
               {
@@ -4285,7 +5902,25 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(TallyDatails)18528_storage": {
+          "t_struct(SnapshotAmount)18529_storage": {
+            "label": "struct DaofinPlugin.SnapshotAmount",
+            "members": [
+              {
+                "label": "amount",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "blockNumber",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(TallyDatails)18480_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -4315,7 +5950,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18508_storage": {
+          "t_struct(VoteInfo)18460_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -4326,7 +5961,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18484",
+                "type": "t_enum(VoteOption)18434",
                 "offset": 1,
                 "slot": "0"
               }
@@ -4352,9 +5987,9 @@
         }
       }
     },
-    "ebc0d0b5a271079536bdc7806ac3e2b2a9a7877382a02f726cd332dfe6837baf": {
-      "address": "0xB377a2EeD7566Ac9fCb0BA673604F9BF875e2Bab",
-      "txHash": "0xfb26566a17b2d8f505b8c018f2be6cabab06ad9ac0f4967f76e99d357772de1a",
+    "419c52952c7f4c8a08c8a5cfe4ba5f82284f757e236de7df61f551c3841f884f": {
+      "address": "0x3347B4d90ebe72BeFb30444C9966B2B990aE9FcB",
+      "txHash": "0x21d67632602092ba29691d5ca78eb19fb9bbae51b1103a062456f8860d2d6078",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -4453,79 +6088,87 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:127"
+            "src": "src/DaofinPlugin.sol:142"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18497_storage",
+            "type": "t_struct(DaofinGlobalSettings)18443_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:129"
+            "src": "src/DaofinPlugin.sol:145"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "354",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18556_storage)",
+            "slot": "355",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18512_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:132"
+            "src": "src/DaofinPlugin.sol:148"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
-            "slot": "355",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)",
+            "slot": "356",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:138"
+            "src": "src/DaofinPlugin.sol:154"
           },
           {
             "label": "_committeesToTallyDetails",
             "offset": 0,
-            "slot": "356",
-            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))",
+            "slot": "357",
+            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:144"
+            "src": "src/DaofinPlugin.sol:160"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
-            "slot": "357",
-            "type": "t_mapping(t_address,t_uint256)",
+            "slot": "358",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:150"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
-            "label": "_votersToPropsalIds",
+            "label": "_votersToProposalIds",
             "offset": 0,
-            "slot": "358",
+            "slot": "359",
             "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:153"
+            "src": "src/DaofinPlugin.sol:172"
           },
           {
             "label": "_judiciaryCommittee",
             "offset": 0,
-            "slot": "359",
+            "slot": "360",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:158"
+            "src": "src/DaofinPlugin.sol:177"
+          },
+          {
+            "label": "_masterNodeDelegatee",
+            "offset": 0,
+            "slot": "361",
+            "type": "t_struct(MasterNodeDelegateeMappings)18540_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:182"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "360",
+            "slot": "364",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:161"
+            "src": "src/DaofinPlugin.sol:185"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
-            "slot": "361",
-            "type": "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage",
+            "slot": "365",
+            "type": "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:164"
+            "src": "src/DaofinPlugin.sol:188"
           }
         ],
         "types": {
@@ -4545,7 +6188,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -4577,11 +6220,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20066": {
+          "t_contract(IXDCValidator)20535": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18490": {
+          "t_enum(VoteOption)18434": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -4591,6 +6234,10 @@
             ],
             "numberOfBytes": "1"
           },
+          "t_mapping(t_address,t_address)": {
+            "label": "mapping(address => address)",
+            "numberOfBytes": "32"
+          },
           "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
             "label": "mapping(address => uint256[])",
             "numberOfBytes": "32"
@@ -4599,27 +6246,31 @@
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18514_storage)": {
-            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
+          "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_uint256)": {
-            "label": "mapping(address => uint256)",
+          "t_mapping(t_address,t_struct(VoteInfo)18460_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))": {
+          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))": {
             "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18556_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)": {
+            "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18512_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(TallyDatails)18534_storage)": {
+          "t_mapping(t_uint256,t_struct(TallyDatails)18480_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
@@ -4647,7 +6298,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18508_storage": {
+          "t_struct(CommitteeVotingSettings)18454_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -4695,12 +6346,12 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18497_storage": {
+          "t_struct(DaofinGlobalSettings)18443_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20066",
+                "type": "t_contract(IXDCValidator)20535",
                 "offset": 0,
                 "slot": "0"
               },
@@ -4709,11 +6360,17 @@
                 "type": "t_array(t_uint256)dyn_storage",
                 "offset": 0,
                 "slot": "1"
+              },
+              {
+                "label": "totalNumberOfMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
               }
             ],
-            "numberOfBytes": "64"
+            "numberOfBytes": "96"
           },
-          "t_struct(ElectionPeriod)18568_storage": {
+          "t_struct(ElectionPeriod)18524_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -4731,7 +6388,31 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(Proposal)18556_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18540_storage": {
+            "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
+            "members": [
+              {
+                "label": "masterNodeToDelegatee",
+                "type": "t_mapping(t_address,t_address)",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "delegateeToMasterNode",
+                "type": "t_mapping(t_address,t_address)",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "lastModificationBlocknumber",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(Proposal)18512_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -4741,45 +6422,57 @@
                 "slot": "0"
               },
               {
-                "label": "parameters",
-                "type": "t_struct(ProposalParameters)18563_storage",
+                "label": "proposer",
+                "type": "t_address",
+                "offset": 1,
+                "slot": "0"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
                 "offset": 0,
                 "slot": "1"
               },
               {
-                "label": "proposer",
-                "type": "t_address",
+                "label": "allowFailureMap",
+                "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
               },
               {
-                "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18514_storage)",
+                "label": "parameters",
+                "type": "t_struct(ProposalParameters)18519_storage",
                 "offset": 0,
                 "slot": "3"
               },
               {
-                "label": "voters",
-                "type": "t_array(t_address)dyn_storage",
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
                 "offset": 0,
                 "slot": "4"
               },
               {
-                "label": "actions",
-                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18460_storage)",
                 "offset": 0,
                 "slot": "5"
               },
               {
-                "label": "allowFailureMap",
-                "type": "t_uint256",
+                "label": "committeeToVotingSettings",
+                "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
                 "offset": 0,
                 "slot": "6"
+              },
+              {
+                "label": "committeeToTallyDatails",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)",
+                "offset": 0,
+                "slot": "7"
               }
             ],
-            "numberOfBytes": "224"
+            "numberOfBytes": "256"
           },
-          "t_struct(ProposalParameters)18563_storage": {
+          "t_struct(ProposalParameters)18519_storage": {
             "label": "struct DaofinPlugin.ProposalParameters",
             "members": [
               {
@@ -4803,7 +6496,25 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(TallyDatails)18534_storage": {
+          "t_struct(SnapshotAmount)18529_storage": {
+            "label": "struct DaofinPlugin.SnapshotAmount",
+            "members": [
+              {
+                "label": "amount",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "blockNumber",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(TallyDatails)18480_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -4833,7 +6544,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18514_storage": {
+          "t_struct(VoteInfo)18460_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -4844,7 +6555,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18490",
+                "type": "t_enum(VoteOption)18434",
                 "offset": 1,
                 "slot": "0"
               }
@@ -4870,9 +6581,9 @@
         }
       }
     },
-    "5afc849f9992c96802be2ae12e673b03b6bcb59be5c137749f9a516d0b08d29d": {
-      "address": "0xab16A69A5a8c12C732e0DEFF4BE56A70bb64c926",
-      "txHash": "0x38b68891a7f7057a6717316b14cb7b27a67c1b05f9df6caa0dc32e3a7c70d4cb",
+    "8bd248abedc4f2642569bc85d515e739dceb76b9da16b2d8ebe535fe01997d09": {
+      "address": "0x32EEce76C2C2e8758584A83Ee2F522D4788feA0f",
+      "txHash": "0x1f160cdc7eb45291c9e8a5b7823e428b24c5293f145caa9825526f0e68841f6b",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -4971,79 +6682,87 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:127"
+            "src": "src/DaofinPlugin.sol:142"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18497_storage",
+            "type": "t_struct(DaofinGlobalSettings)18443_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:129"
+            "src": "src/DaofinPlugin.sol:145"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "354",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18556_storage)",
+            "slot": "355",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18512_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:132"
+            "src": "src/DaofinPlugin.sol:148"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
-            "slot": "355",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)",
+            "slot": "356",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:138"
+            "src": "src/DaofinPlugin.sol:154"
           },
           {
             "label": "_committeesToTallyDetails",
             "offset": 0,
-            "slot": "356",
-            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))",
+            "slot": "357",
+            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:144"
+            "src": "src/DaofinPlugin.sol:160"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
-            "slot": "357",
-            "type": "t_mapping(t_address,t_uint256)",
+            "slot": "358",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:150"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
-            "label": "_votersToPropsalIds",
+            "label": "_votersToProposalIds",
             "offset": 0,
-            "slot": "358",
+            "slot": "359",
             "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:153"
+            "src": "src/DaofinPlugin.sol:172"
           },
           {
             "label": "_judiciaryCommittee",
             "offset": 0,
-            "slot": "359",
+            "slot": "360",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:158"
+            "src": "src/DaofinPlugin.sol:177"
+          },
+          {
+            "label": "_masterNodeDelegatee",
+            "offset": 0,
+            "slot": "361",
+            "type": "t_struct(MasterNodeDelegateeMappings)18540_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:182"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "360",
+            "slot": "364",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:161"
+            "src": "src/DaofinPlugin.sol:185"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
-            "slot": "361",
-            "type": "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage",
+            "slot": "365",
+            "type": "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:164"
+            "src": "src/DaofinPlugin.sol:188"
           }
         ],
         "types": {
@@ -5063,7 +6782,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18568_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -5095,11 +6814,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20070": {
+          "t_contract(IXDCValidator)20533": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18490": {
+          "t_enum(VoteOption)18434": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -5109,6 +6828,10 @@
             ],
             "numberOfBytes": "1"
           },
+          "t_mapping(t_address,t_address)": {
+            "label": "mapping(address => address)",
+            "numberOfBytes": "32"
+          },
           "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
             "label": "mapping(address => uint256[])",
             "numberOfBytes": "32"
@@ -5117,27 +6840,31 @@
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18514_storage)": {
-            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
+          "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_uint256)": {
-            "label": "mapping(address => uint256)",
+          "t_mapping(t_address,t_struct(VoteInfo)18460_storage)": {
+            "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18534_storage))": {
+          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))": {
             "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18508_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18556_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)": {
+            "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18512_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(TallyDatails)18534_storage)": {
+          "t_mapping(t_uint256,t_struct(TallyDatails)18480_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
@@ -5165,7 +6892,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18508_storage": {
+          "t_struct(CommitteeVotingSettings)18454_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -5213,12 +6940,12 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18497_storage": {
+          "t_struct(DaofinGlobalSettings)18443_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20070",
+                "type": "t_contract(IXDCValidator)20533",
                 "offset": 0,
                 "slot": "0"
               },
@@ -5227,11 +6954,17 @@
                 "type": "t_array(t_uint256)dyn_storage",
                 "offset": 0,
                 "slot": "1"
+              },
+              {
+                "label": "totalNumberOfMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
               }
             ],
-            "numberOfBytes": "64"
+            "numberOfBytes": "96"
           },
-          "t_struct(ElectionPeriod)18568_storage": {
+          "t_struct(ElectionPeriod)18524_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -5249,7 +6982,31 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(Proposal)18556_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18540_storage": {
+            "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
+            "members": [
+              {
+                "label": "masterNodeToDelegatee",
+                "type": "t_mapping(t_address,t_address)",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "delegateeToMasterNode",
+                "type": "t_mapping(t_address,t_address)",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "lastModificationBlocknumber",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              }
+            ],
+            "numberOfBytes": "96"
+          },
+          "t_struct(Proposal)18512_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -5259,45 +7016,57 @@
                 "slot": "0"
               },
               {
-                "label": "parameters",
-                "type": "t_struct(ProposalParameters)18563_storage",
+                "label": "proposer",
+                "type": "t_address",
+                "offset": 1,
+                "slot": "0"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
                 "offset": 0,
                 "slot": "1"
               },
               {
-                "label": "proposer",
-                "type": "t_address",
+                "label": "allowFailureMap",
+                "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
               },
               {
-                "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18514_storage)",
+                "label": "parameters",
+                "type": "t_struct(ProposalParameters)18519_storage",
                 "offset": 0,
                 "slot": "3"
               },
               {
-                "label": "voters",
-                "type": "t_array(t_address)dyn_storage",
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
                 "offset": 0,
                 "slot": "4"
               },
               {
-                "label": "actions",
-                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18460_storage)",
                 "offset": 0,
                 "slot": "5"
               },
               {
-                "label": "allowFailureMap",
-                "type": "t_uint256",
+                "label": "committeeToVotingSettings",
+                "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
                 "offset": 0,
                 "slot": "6"
+              },
+              {
+                "label": "committeeToTallyDatails",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)",
+                "offset": 0,
+                "slot": "7"
               }
             ],
-            "numberOfBytes": "224"
+            "numberOfBytes": "256"
           },
-          "t_struct(ProposalParameters)18563_storage": {
+          "t_struct(ProposalParameters)18519_storage": {
             "label": "struct DaofinPlugin.ProposalParameters",
             "members": [
               {
@@ -5321,7 +7090,25 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(TallyDatails)18534_storage": {
+          "t_struct(SnapshotAmount)18529_storage": {
+            "label": "struct DaofinPlugin.SnapshotAmount",
+            "members": [
+              {
+                "label": "amount",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "blockNumber",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_struct(TallyDatails)18480_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -5351,7 +7138,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18514_storage": {
+          "t_struct(VoteInfo)18460_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -5362,7 +7149,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18490",
+                "type": "t_enum(VoteOption)18434",
                 "offset": 1,
                 "slot": "0"
               }
@@ -5388,9 +7175,9 @@
         }
       }
     },
-    "c222f77af1421c4e3bf0123ebb60c9e72fa9da4a95f5fa98f67fdea4f86ab9f5": {
-      "address": "0xAA292E8611aDF267e563f334Ee42320aC96D0463",
-      "txHash": "0x58ae91ffdc113adfb2e58ebaf814962ab67fc9ec25fc5a07284a0e5667f9da58",
+    "15253cd265af8a22cbf83fdbf14720113d6ad536a0a95a664cd37e35973924a3": {
+      "address": "0xefc1aB2475ACb7E60499Efb171D173be19928a05",
+      "txHash": "0x9a488e43adc411e4da46457190c49a32ec3adc599c9824214a03e67763b96c19",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -5489,55 +7276,39 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:142"
+            "src": "src/DaofinPlugin.sol:147"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18443_storage",
+            "type": "t_struct(DaofinGlobalSettings)18510_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:145"
+            "src": "src/DaofinPlugin.sol:150"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "355",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18512_storage)",
-            "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:148"
-          },
-          {
-            "label": "_committeesToVotingSettings",
-            "offset": 0,
-            "slot": "356",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
-            "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:154"
-          },
-          {
-            "label": "_committeesToTallyDetails",
-            "offset": 0,
             "slot": "357",
-            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18574_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:160"
+            "src": "src/DaofinPlugin.sol:153"
           },
           {
-            "label": "_voterToLockedAmounts",
+            "label": "_committeesToVotingSettings",
             "offset": 0,
             "slot": "358",
-            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:159"
           },
           {
-            "label": "_votersToProposalIds",
+            "label": "_voterToLockedAmounts",
             "offset": 0,
             "slot": "359",
-            "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:172"
+            "src": "src/DaofinPlugin.sol:165"
           },
           {
             "label": "_judiciaryCommittee",
@@ -5545,31 +7316,31 @@
             "slot": "360",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:177"
+            "src": "src/DaofinPlugin.sol:176"
           },
           {
             "label": "_masterNodeDelegatee",
             "offset": 0,
             "slot": "361",
-            "type": "t_struct(MasterNodeDelegateeMappings)18540_storage",
+            "type": "t_struct(MasterNodeDelegateeMappings)18604_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:182"
+            "src": "src/DaofinPlugin.sol:180"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "364",
+            "slot": "365",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:185"
+            "src": "src/DaofinPlugin.sol:183"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
-            "slot": "365",
-            "type": "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage",
+            "slot": "366",
+            "type": "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:188"
+            "src": "src/DaofinPlugin.sol:186"
           }
         ],
         "types": {
@@ -5589,7 +7360,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -5621,11 +7392,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20524": {
+          "t_contract(IXDCValidator)20725": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18434": {
+          "t_enum(VoteOption)18497": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -5639,42 +7410,30 @@
             "label": "mapping(address => address)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
-            "label": "mapping(address => uint256[])",
-            "numberOfBytes": "32"
-          },
           "t_mapping(t_address,t_bool)": {
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)": {
+          "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)": {
             "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18460_storage)": {
+          "t_mapping(t_address,t_struct(VoteInfo)18527_storage)": {
             "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))": {
-            "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
-            "numberOfBytes": "32"
-          },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18512_storage)": {
+          "t_mapping(t_uint256,t_struct(Proposal)18574_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(TallyDatails)18480_storage)": {
-            "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
-            "numberOfBytes": "32"
-          },
           "t_struct(Action)8275_storage": {
             "label": "struct IDAO.Action",
             "members": [
@@ -5699,7 +7458,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18454_storage": {
+          "t_struct(CommitteeVotingSettings)18521_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -5747,12 +7506,12 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18443_storage": {
+          "t_struct(DaofinGlobalSettings)18510_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20524",
+                "type": "t_contract(IXDCValidator)20725",
                 "offset": 0,
                 "slot": "0"
               },
@@ -5760,18 +7519,30 @@
                 "label": "allowedAmounts",
                 "type": "t_array(t_uint256)dyn_storage",
                 "offset": 0,
-                "slot": "1"
+                "slot": "1"
+              },
+              {
+                "label": "totalNumberOfMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "totalNumberOfJudiciaries",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
               },
               {
-                "label": "totalNumberOfMasterNodes",
+                "label": "totalNumberOfPeoplesHouse",
                 "type": "t_uint256",
                 "offset": 0,
-                "slot": "2"
+                "slot": "4"
               }
             ],
-            "numberOfBytes": "96"
+            "numberOfBytes": "160"
           },
-          "t_struct(ElectionPeriod)18524_storage": {
+          "t_struct(ElectionPeriod)18586_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -5789,7 +7560,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(MasterNodeDelegateeMappings)18540_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18604_storage": {
             "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
             "members": [
               {
@@ -5809,11 +7580,17 @@
                 "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
+              },
+              {
+                "label": "numberOfJointMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
               }
             ],
-            "numberOfBytes": "96"
+            "numberOfBytes": "128"
           },
-          "t_struct(Proposal)18512_storage": {
+          "t_struct(Proposal)18574_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -5842,7 +7619,7 @@
               },
               {
                 "label": "parameters",
-                "type": "t_struct(ProposalParameters)18519_storage",
+                "type": "t_struct(ProposalParameters)18581_storage",
                 "offset": 0,
                 "slot": "3"
               },
@@ -5854,26 +7631,20 @@
               },
               {
                 "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18460_storage)",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18527_storage)",
                 "offset": 0,
                 "slot": "5"
               },
-              {
-                "label": "committeeToVotingSettings",
-                "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
-                "offset": 0,
-                "slot": "6"
-              },
               {
                 "label": "committeeToTallyDatails",
-                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)",
                 "offset": 0,
-                "slot": "7"
+                "slot": "6"
               }
             ],
-            "numberOfBytes": "256"
+            "numberOfBytes": "224"
           },
-          "t_struct(ProposalParameters)18519_storage": {
+          "t_struct(ProposalParameters)18581_storage": {
             "label": "struct DaofinPlugin.ProposalParameters",
             "members": [
               {
@@ -5897,7 +7668,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(SnapshotAmount)18529_storage": {
+          "t_struct(SnapshotAmount)18591_storage": {
             "label": "struct DaofinPlugin.SnapshotAmount",
             "members": [
               {
@@ -5915,7 +7686,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(TallyDatails)18480_storage": {
+          "t_struct(TallyDatails)18547_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -5945,7 +7716,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18460_storage": {
+          "t_struct(VoteInfo)18527_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -5956,7 +7727,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18434",
+                "type": "t_enum(VoteOption)18497",
                 "offset": 1,
                 "slot": "0"
               }
@@ -5982,9 +7753,9 @@
         }
       }
     },
-    "419c52952c7f4c8a08c8a5cfe4ba5f82284f757e236de7df61f551c3841f884f": {
-      "address": "0x3347B4d90ebe72BeFb30444C9966B2B990aE9FcB",
-      "txHash": "0x21d67632602092ba29691d5ca78eb19fb9bbae51b1103a062456f8860d2d6078",
+    "0fdf0b67b478784e3c58d1abe0b0f40e388a8f3fa71a066b5aa76d7fb161a49a": {
+      "address": "0x870526b7973b56163a6997bB7C886F5E4EA53638",
+      "txHash": "0x0b2fc05f8f0758157ffc1f5532081e59c8201db4271468cb371406122fcbe927",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -6083,55 +7854,39 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:142"
+            "src": "src/DaofinPlugin.sol:152"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18443_storage",
+            "type": "t_struct(DaofinGlobalSettings)18510_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:145"
+            "src": "src/DaofinPlugin.sol:155"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "355",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18512_storage)",
-            "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:148"
-          },
-          {
-            "label": "_committeesToVotingSettings",
-            "offset": 0,
-            "slot": "356",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
-            "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:154"
-          },
-          {
-            "label": "_committeesToTallyDetails",
-            "offset": 0,
             "slot": "357",
-            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18574_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:160"
+            "src": "src/DaofinPlugin.sol:158"
           },
           {
-            "label": "_voterToLockedAmounts",
+            "label": "_committeesToVotingSettings",
             "offset": 0,
             "slot": "358",
-            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:164"
           },
           {
-            "label": "_votersToProposalIds",
+            "label": "_voterToLockedAmounts",
             "offset": 0,
             "slot": "359",
-            "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:172"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_judiciaryCommittee",
@@ -6139,31 +7894,31 @@
             "slot": "360",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:177"
+            "src": "src/DaofinPlugin.sol:181"
           },
           {
             "label": "_masterNodeDelegatee",
             "offset": 0,
             "slot": "361",
-            "type": "t_struct(MasterNodeDelegateeMappings)18540_storage",
+            "type": "t_struct(MasterNodeDelegateeMappings)18604_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:182"
+            "src": "src/DaofinPlugin.sol:185"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "364",
+            "slot": "365",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:185"
+            "src": "src/DaofinPlugin.sol:188"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
-            "slot": "365",
-            "type": "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage",
+            "slot": "366",
+            "type": "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:188"
+            "src": "src/DaofinPlugin.sol:191"
           }
         ],
         "types": {
@@ -6183,7 +7938,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -6215,11 +7970,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20535": {
+          "t_contract(IXDCValidator)20728": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18434": {
+          "t_enum(VoteOption)18497": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -6233,42 +7988,30 @@
             "label": "mapping(address => address)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
-            "label": "mapping(address => uint256[])",
-            "numberOfBytes": "32"
-          },
           "t_mapping(t_address,t_bool)": {
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)": {
+          "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)": {
             "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18460_storage)": {
+          "t_mapping(t_address,t_struct(VoteInfo)18527_storage)": {
             "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))": {
-            "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
-            "numberOfBytes": "32"
-          },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18512_storage)": {
+          "t_mapping(t_uint256,t_struct(Proposal)18574_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(TallyDatails)18480_storage)": {
-            "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
-            "numberOfBytes": "32"
-          },
           "t_struct(Action)8275_storage": {
             "label": "struct IDAO.Action",
             "members": [
@@ -6293,7 +8036,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18454_storage": {
+          "t_struct(CommitteeVotingSettings)18521_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -6341,12 +8084,12 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18443_storage": {
+          "t_struct(DaofinGlobalSettings)18510_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20535",
+                "type": "t_contract(IXDCValidator)20728",
                 "offset": 0,
                 "slot": "0"
               },
@@ -6361,11 +8104,23 @@
                 "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
+              },
+              {
+                "label": "totalNumberOfJudiciaries",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
+              },
+              {
+                "label": "totalNumberOfPeoplesHouse",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "4"
               }
             ],
-            "numberOfBytes": "96"
+            "numberOfBytes": "160"
           },
-          "t_struct(ElectionPeriod)18524_storage": {
+          "t_struct(ElectionPeriod)18586_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -6383,7 +8138,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(MasterNodeDelegateeMappings)18540_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18604_storage": {
             "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
             "members": [
               {
@@ -6403,11 +8158,17 @@
                 "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
+              },
+              {
+                "label": "numberOfJointMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
               }
             ],
-            "numberOfBytes": "96"
+            "numberOfBytes": "128"
           },
-          "t_struct(Proposal)18512_storage": {
+          "t_struct(Proposal)18574_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -6436,7 +8197,7 @@
               },
               {
                 "label": "parameters",
-                "type": "t_struct(ProposalParameters)18519_storage",
+                "type": "t_struct(ProposalParameters)18581_storage",
                 "offset": 0,
                 "slot": "3"
               },
@@ -6448,26 +8209,20 @@
               },
               {
                 "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18460_storage)",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18527_storage)",
                 "offset": 0,
                 "slot": "5"
               },
-              {
-                "label": "committeeToVotingSettings",
-                "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
-                "offset": 0,
-                "slot": "6"
-              },
               {
                 "label": "committeeToTallyDatails",
-                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)",
                 "offset": 0,
-                "slot": "7"
+                "slot": "6"
               }
             ],
-            "numberOfBytes": "256"
+            "numberOfBytes": "224"
           },
-          "t_struct(ProposalParameters)18519_storage": {
+          "t_struct(ProposalParameters)18581_storage": {
             "label": "struct DaofinPlugin.ProposalParameters",
             "members": [
               {
@@ -6491,7 +8246,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(SnapshotAmount)18529_storage": {
+          "t_struct(SnapshotAmount)18591_storage": {
             "label": "struct DaofinPlugin.SnapshotAmount",
             "members": [
               {
@@ -6509,7 +8264,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(TallyDatails)18480_storage": {
+          "t_struct(TallyDatails)18547_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -6539,7 +8294,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18460_storage": {
+          "t_struct(VoteInfo)18527_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -6550,7 +8305,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18434",
+                "type": "t_enum(VoteOption)18497",
                 "offset": 1,
                 "slot": "0"
               }
@@ -6576,9 +8331,9 @@
         }
       }
     },
-    "8bd248abedc4f2642569bc85d515e739dceb76b9da16b2d8ebe535fe01997d09": {
-      "address": "0x32EEce76C2C2e8758584A83Ee2F522D4788feA0f",
-      "txHash": "0x1f160cdc7eb45291c9e8a5b7823e428b24c5293f145caa9825526f0e68841f6b",
+    "9657f47c80c4e9231febe133f481dfe5a77d1cc5634e16325592476aecfada29": {
+      "address": "0xE92D669bF46a0387E1B2ba5F1b8AFBD3E156B14A",
+      "txHash": "0x75b4f1ec02c37da532c700361c5cf5c95eae95b360b1b62fcb24191dc8ae6a8e",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -6677,87 +8432,79 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:142"
+            "src": "src/DaofinPlugin.sol:149"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18443_storage",
+            "type": "t_struct(DaofinGlobalSettings)18505_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:145"
+            "src": "src/DaofinPlugin.sol:152"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "355",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18512_storage)",
+            "slot": "354",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18569_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:148"
+            "src": "src/DaofinPlugin.sol:155"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
-            "slot": "356",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
-            "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:154"
-          },
-          {
-            "label": "_committeesToTallyDetails",
-            "offset": 0,
-            "slot": "357",
-            "type": "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))",
+            "slot": "355",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18516_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:160"
+            "src": "src/DaofinPlugin.sol:161"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
-            "slot": "358",
-            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)",
+            "slot": "356",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18586_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:167"
           },
           {
-            "label": "_votersToProposalIds",
+            "label": "_judiciaryCommittee",
             "offset": 0,
-            "slot": "359",
-            "type": "t_mapping(t_address,t_array(t_uint256)dyn_storage)",
+            "slot": "357",
+            "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:172"
+            "src": "src/DaofinPlugin.sol:178"
           },
           {
-            "label": "_judiciaryCommittee",
+            "label": "_judiciaryCommitteeCount",
             "offset": 0,
-            "slot": "360",
-            "type": "t_mapping(t_address,t_bool)",
+            "slot": "358",
+            "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:177"
+            "src": "src/DaofinPlugin.sol:179"
           },
           {
             "label": "_masterNodeDelegatee",
             "offset": 0,
-            "slot": "361",
-            "type": "t_struct(MasterNodeDelegateeMappings)18540_storage",
+            "slot": "359",
+            "type": "t_struct(MasterNodeDelegateeMappings)18599_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:182"
+            "src": "src/DaofinPlugin.sol:183"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "364",
+            "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:185"
+            "src": "src/DaofinPlugin.sol:186"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
-            "slot": "365",
-            "type": "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage",
+            "slot": "364",
+            "type": "t_array(t_struct(ElectionPeriod)18581_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:188"
+            "src": "src/DaofinPlugin.sol:189"
           }
         ],
         "types": {
@@ -6777,7 +8524,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18524_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18581_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -6809,11 +8556,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20533": {
+          "t_contract(IXDCValidator)20851": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18434": {
+          "t_enum(VoteOption)18498": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -6827,42 +8574,30 @@
             "label": "mapping(address => address)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_array(t_uint256)dyn_storage)": {
-            "label": "mapping(address => uint256[])",
-            "numberOfBytes": "32"
-          },
           "t_mapping(t_address,t_bool)": {
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(SnapshotAmount)18529_storage)": {
+          "t_mapping(t_address,t_struct(SnapshotAmount)18586_storage)": {
             "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18460_storage)": {
+          "t_mapping(t_address,t_struct(VoteInfo)18522_storage)": {
             "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_mapping(t_uint256,t_struct(TallyDatails)18480_storage))": {
-            "label": "mapping(bytes32 => mapping(uint256 => struct DaofinPlugin.TallyDatails))",
-            "numberOfBytes": "32"
-          },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18516_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18542_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18512_storage)": {
+          "t_mapping(t_uint256,t_struct(Proposal)18569_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(TallyDatails)18480_storage)": {
-            "label": "mapping(uint256 => struct DaofinPlugin.TallyDatails)",
-            "numberOfBytes": "32"
-          },
           "t_struct(Action)8275_storage": {
             "label": "struct IDAO.Action",
             "members": [
@@ -6887,7 +8622,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18454_storage": {
+          "t_struct(CommitteeVotingSettings)18516_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -6935,12 +8670,12 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18443_storage": {
+          "t_struct(DaofinGlobalSettings)18505_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20533",
+                "type": "t_contract(IXDCValidator)20851",
                 "offset": 0,
                 "slot": "0"
               },
@@ -6949,17 +8684,11 @@
                 "type": "t_array(t_uint256)dyn_storage",
                 "offset": 0,
                 "slot": "1"
-              },
-              {
-                "label": "totalNumberOfMasterNodes",
-                "type": "t_uint256",
-                "offset": 0,
-                "slot": "2"
               }
             ],
-            "numberOfBytes": "96"
+            "numberOfBytes": "64"
           },
-          "t_struct(ElectionPeriod)18524_storage": {
+          "t_struct(ElectionPeriod)18581_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -6977,7 +8706,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(MasterNodeDelegateeMappings)18540_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18599_storage": {
             "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
             "members": [
               {
@@ -6997,11 +8726,17 @@
                 "type": "t_uint256",
                 "offset": 0,
                 "slot": "2"
+              },
+              {
+                "label": "numberOfJointMasterNodes",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "3"
               }
             ],
-            "numberOfBytes": "96"
+            "numberOfBytes": "128"
           },
-          "t_struct(Proposal)18512_storage": {
+          "t_struct(Proposal)18569_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -7030,7 +8765,7 @@
               },
               {
                 "label": "parameters",
-                "type": "t_struct(ProposalParameters)18519_storage",
+                "type": "t_struct(ProposalParameters)18576_storage",
                 "offset": 0,
                 "slot": "3"
               },
@@ -7042,26 +8777,20 @@
               },
               {
                 "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18460_storage)",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18522_storage)",
                 "offset": 0,
                 "slot": "5"
               },
-              {
-                "label": "committeeToVotingSettings",
-                "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18454_storage)",
-                "offset": 0,
-                "slot": "6"
-              },
               {
                 "label": "committeeToTallyDatails",
-                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18480_storage)",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18542_storage)",
                 "offset": 0,
-                "slot": "7"
+                "slot": "6"
               }
             ],
-            "numberOfBytes": "256"
+            "numberOfBytes": "224"
           },
-          "t_struct(ProposalParameters)18519_storage": {
+          "t_struct(ProposalParameters)18576_storage": {
             "label": "struct DaofinPlugin.ProposalParameters",
             "members": [
               {
@@ -7085,7 +8814,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(SnapshotAmount)18529_storage": {
+          "t_struct(SnapshotAmount)18586_storage": {
             "label": "struct DaofinPlugin.SnapshotAmount",
             "members": [
               {
@@ -7103,7 +8832,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(TallyDatails)18480_storage": {
+          "t_struct(TallyDatails)18542_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -7133,7 +8862,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18460_storage": {
+          "t_struct(VoteInfo)18522_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -7144,7 +8873,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18434",
+                "type": "t_enum(VoteOption)18498",
                 "offset": 1,
                 "slot": "0"
               }
@@ -7170,9 +8899,9 @@
         }
       }
     },
-    "15253cd265af8a22cbf83fdbf14720113d6ad536a0a95a664cd37e35973924a3": {
-      "address": "0xefc1aB2475ACb7E60499Efb171D173be19928a05",
-      "txHash": "0x9a488e43adc411e4da46457190c49a32ec3adc599c9824214a03e67763b96c19",
+    "94952a8d324a51edbbb771cc7ef8c181cafb01874433d5b32413c5abe6386e9e": {
+      "address": "0x2661709488E7ddDe2506Ae1025961964708a86C6",
+      "txHash": "0x1efa19940767e01c5d3930d4e2e131b603595e6dcd2dd0b12e41b76adf6ac48a",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -7271,71 +9000,95 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:147"
+            "src": "src/DaofinPlugin.sol:136"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18510_storage",
+            "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:150"
+            "src": "src/DaofinPlugin.sol:139"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "357",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18574_storage)",
+            "slot": "354",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:153"
+            "src": "src/DaofinPlugin.sol:142"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
-            "slot": "358",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)",
+            "slot": "355",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:159"
+            "src": "src/DaofinPlugin.sol:148"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
-            "slot": "359",
-            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)",
+            "slot": "356",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:165"
+            "src": "src/DaofinPlugin.sol:154"
           },
           {
             "label": "_judiciaryCommittee",
             "offset": 0,
-            "slot": "360",
+            "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:176"
+            "src": "src/DaofinPlugin.sol:165"
+          },
+          {
+            "label": "_judiciaryCommitteeCount",
+            "offset": 0,
+            "slot": "358",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
             "label": "_masterNodeDelegatee",
             "offset": 0,
-            "slot": "361",
-            "type": "t_struct(MasterNodeDelegateeMappings)18604_storage",
+            "slot": "359",
+            "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:180"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "365",
+            "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:183"
+            "src": "src/DaofinPlugin.sol:173"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
+            "slot": "364",
+            "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:176"
+          },
+          {
+            "label": "proposalTypeCounter",
+            "offset": 0,
+            "slot": "365",
+            "type": "t_struct(Counter)3259_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:179"
+          },
+          {
+            "label": "_proposalTypesToCommiteesVotingSettings",
+            "offset": 0,
             "slot": "366",
-            "type": "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage",
+            "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:186"
+            "src": "src/DaofinPlugin.sol:181"
           }
         ],
         "types": {
@@ -7355,7 +9108,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -7367,10 +9120,6 @@
             "label": "uint256[50]",
             "numberOfBytes": "1600"
           },
-          "t_array(t_uint256)dyn_storage": {
-            "label": "uint256[]",
-            "numberOfBytes": "32"
-          },
           "t_bool": {
             "label": "bool",
             "numberOfBytes": "1"
@@ -7387,11 +9136,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20725": {
+          "t_contract(IXDCValidator)21073": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18497": {
+          "t_enum(VoteOption)18503": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -7409,23 +9158,27 @@
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)": {
+          "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)": {
             "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18527_storage)": {
+          "t_mapping(t_address,t_struct(VoteInfo)18524_storage)": {
             "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18540_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18574_storage)": {
+          "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))": {
+            "label": "mapping(uint256 => mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18572_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
@@ -7453,7 +9206,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18521_storage": {
+          "t_struct(CommitteeVotingSettings)18518_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -7474,12 +9227,6 @@
                 "offset": 4,
                 "slot": "1"
               },
-              {
-                "label": "minDuration",
-                "type": "t_uint64",
-                "offset": 8,
-                "slot": "1"
-              },
               {
                 "label": "minVotingPower",
                 "type": "t_uint256",
@@ -7501,43 +9248,25 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18510_storage": {
+          "t_struct(DaofinGlobalSettings)18509_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20725",
+                "type": "t_contract(IXDCValidator)21073",
                 "offset": 0,
                 "slot": "0"
               },
               {
-                "label": "allowedAmounts",
-                "type": "t_array(t_uint256)dyn_storage",
-                "offset": 0,
-                "slot": "1"
-              },
-              {
-                "label": "totalNumberOfMasterNodes",
-                "type": "t_uint256",
-                "offset": 0,
-                "slot": "2"
-              },
-              {
-                "label": "totalNumberOfJudiciaries",
-                "type": "t_uint256",
-                "offset": 0,
-                "slot": "3"
-              },
-              {
-                "label": "totalNumberOfPeoplesHouse",
+                "label": "houseMinAmount",
                 "type": "t_uint256",
                 "offset": 0,
-                "slot": "4"
+                "slot": "1"
               }
             ],
-            "numberOfBytes": "160"
+            "numberOfBytes": "64"
           },
-          "t_struct(ElectionPeriod)18586_storage": {
+          "t_struct(ElectionPeriod)18577_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -7555,7 +9284,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(MasterNodeDelegateeMappings)18604_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18595_storage": {
             "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
             "members": [
               {
@@ -7585,7 +9314,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(Proposal)18574_storage": {
+          "t_struct(Proposal)18572_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -7598,72 +9327,66 @@
                 "label": "proposer",
                 "type": "t_address",
                 "offset": 1,
-                "slot": "0"
-              },
-              {
-                "label": "voters",
-                "type": "t_array(t_address)dyn_storage",
-                "offset": 0,
-                "slot": "1"
-              },
-              {
-                "label": "allowFailureMap",
-                "type": "t_uint256",
-                "offset": 0,
-                "slot": "2"
-              },
-              {
-                "label": "parameters",
-                "type": "t_struct(ProposalParameters)18581_storage",
-                "offset": 0,
-                "slot": "3"
-              },
-              {
-                "label": "actions",
-                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
-                "offset": 0,
-                "slot": "4"
+                "slot": "0"
               },
               {
-                "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18527_storage)",
+                "label": "proposalTypeId",
+                "type": "t_uint256",
                 "offset": 0,
-                "slot": "5"
+                "slot": "1"
               },
               {
-                "label": "committeeToTallyDatails",
-                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)",
+                "label": "allowFailureMap",
+                "type": "t_uint256",
                 "offset": 0,
-                "slot": "6"
-              }
-            ],
-            "numberOfBytes": "224"
-          },
-          "t_struct(ProposalParameters)18581_storage": {
-            "label": "struct DaofinPlugin.ProposalParameters",
-            "members": [
+                "slot": "2"
+              },
               {
                 "label": "startDate",
                 "type": "t_uint64",
                 "offset": 0,
-                "slot": "0"
+                "slot": "3"
               },
               {
                 "label": "endDate",
                 "type": "t_uint64",
                 "offset": 8,
-                "slot": "0"
+                "slot": "3"
               },
               {
                 "label": "snapshotBlock",
                 "type": "t_uint64",
                 "offset": 16,
-                "slot": "0"
+                "slot": "3"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
+                "offset": 0,
+                "slot": "4"
+              },
+              {
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "offset": 0,
+                "slot": "5"
+              },
+              {
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18524_storage)",
+                "offset": 0,
+                "slot": "6"
+              },
+              {
+                "label": "committeeToTallyDatails",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18540_storage)",
+                "offset": 0,
+                "slot": "7"
               }
             ],
-            "numberOfBytes": "32"
+            "numberOfBytes": "256"
           },
-          "t_struct(SnapshotAmount)18591_storage": {
+          "t_struct(SnapshotAmount)18582_storage": {
             "label": "struct DaofinPlugin.SnapshotAmount",
             "members": [
               {
@@ -7681,7 +9404,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(TallyDatails)18547_storage": {
+          "t_struct(TallyDatails)18540_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -7711,7 +9434,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18527_storage": {
+          "t_struct(VoteInfo)18524_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -7722,7 +9445,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18497",
+                "type": "t_enum(VoteOption)18503",
                 "offset": 1,
                 "slot": "0"
               }
@@ -7748,9 +9471,9 @@
         }
       }
     },
-    "0fdf0b67b478784e3c58d1abe0b0f40e388a8f3fa71a066b5aa76d7fb161a49a": {
-      "address": "0x870526b7973b56163a6997bB7C886F5E4EA53638",
-      "txHash": "0x0b2fc05f8f0758157ffc1f5532081e59c8201db4271468cb371406122fcbe927",
+    "b01a6eb3aaa25076b9eb8e1acd40fe18c48c0e9b18b03c3860c5782cdb290425": {
+      "address": "0x49D6d6b9F5051e3F8E7492203e6772B0d3c7350c",
+      "txHash": "0x4160d5025a526cd838e79c14be310a7fd2192bc726905151290e9857d1de2553",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -7849,71 +9572,95 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:152"
+            "src": "src/DaofinPlugin.sol:136"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18510_storage",
+            "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:155"
+            "src": "src/DaofinPlugin.sol:139"
           },
           {
             "label": "_proposals",
             "offset": 0,
-            "slot": "357",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18574_storage)",
+            "slot": "354",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:158"
+            "src": "src/DaofinPlugin.sol:142"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
-            "slot": "358",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)",
+            "slot": "355",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:164"
+            "src": "src/DaofinPlugin.sol:148"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
-            "slot": "359",
-            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)",
+            "slot": "356",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:170"
+            "src": "src/DaofinPlugin.sol:154"
           },
           {
             "label": "_judiciaryCommittee",
             "offset": 0,
-            "slot": "360",
+            "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:181"
+            "src": "src/DaofinPlugin.sol:165"
+          },
+          {
+            "label": "_judiciaryCommitteeCount",
+            "offset": 0,
+            "slot": "358",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
             "label": "_masterNodeDelegatee",
             "offset": 0,
-            "slot": "361",
-            "type": "t_struct(MasterNodeDelegateeMappings)18604_storage",
+            "slot": "359",
+            "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:185"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_committeesList",
             "offset": 0,
-            "slot": "365",
+            "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:188"
+            "src": "src/DaofinPlugin.sol:173"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
+            "slot": "364",
+            "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:176"
+          },
+          {
+            "label": "proposalTypeCounter",
+            "offset": 0,
+            "slot": "365",
+            "type": "t_struct(Counter)3259_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:179"
+          },
+          {
+            "label": "_proposalTypesToCommiteesVotingSettings",
+            "offset": 0,
             "slot": "366",
-            "type": "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage",
+            "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:191"
+            "src": "src/DaofinPlugin.sol:181"
           }
         ],
         "types": {
@@ -7933,7 +9680,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18586_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -7945,10 +9692,6 @@
             "label": "uint256[50]",
             "numberOfBytes": "1600"
           },
-          "t_array(t_uint256)dyn_storage": {
-            "label": "uint256[]",
-            "numberOfBytes": "32"
-          },
           "t_bool": {
             "label": "bool",
             "numberOfBytes": "1"
@@ -7965,11 +9708,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20728": {
+          "t_contract(IXDCValidator)21053": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18497": {
+          "t_enum(VoteOption)18503": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -7987,23 +9730,27 @@
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(SnapshotAmount)18591_storage)": {
+          "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)": {
             "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18527_storage)": {
+          "t_mapping(t_address,t_struct(VoteInfo)18524_storage)": {
             "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18521_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18540_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18574_storage)": {
+          "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))": {
+            "label": "mapping(uint256 => mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18572_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
@@ -8031,7 +9778,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18521_storage": {
+          "t_struct(CommitteeVotingSettings)18518_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -8052,12 +9799,6 @@
                 "offset": 4,
                 "slot": "1"
               },
-              {
-                "label": "minDuration",
-                "type": "t_uint64",
-                "offset": 8,
-                "slot": "1"
-              },
               {
                 "label": "minVotingPower",
                 "type": "t_uint256",
@@ -8079,43 +9820,25 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18510_storage": {
+          "t_struct(DaofinGlobalSettings)18509_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20728",
+                "type": "t_contract(IXDCValidator)21053",
                 "offset": 0,
                 "slot": "0"
               },
               {
-                "label": "allowedAmounts",
-                "type": "t_array(t_uint256)dyn_storage",
-                "offset": 0,
-                "slot": "1"
-              },
-              {
-                "label": "totalNumberOfMasterNodes",
-                "type": "t_uint256",
-                "offset": 0,
-                "slot": "2"
-              },
-              {
-                "label": "totalNumberOfJudiciaries",
-                "type": "t_uint256",
-                "offset": 0,
-                "slot": "3"
-              },
-              {
-                "label": "totalNumberOfPeoplesHouse",
+                "label": "houseMinAmount",
                 "type": "t_uint256",
                 "offset": 0,
-                "slot": "4"
+                "slot": "1"
               }
             ],
-            "numberOfBytes": "160"
+            "numberOfBytes": "64"
           },
-          "t_struct(ElectionPeriod)18586_storage": {
+          "t_struct(ElectionPeriod)18577_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -8133,7 +9856,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(MasterNodeDelegateeMappings)18604_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18595_storage": {
             "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
             "members": [
               {
@@ -8163,7 +9886,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(Proposal)18574_storage": {
+          "t_struct(Proposal)18572_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -8179,8 +9902,8 @@
                 "slot": "0"
               },
               {
-                "label": "voters",
-                "type": "t_array(t_address)dyn_storage",
+                "label": "proposalTypeId",
+                "type": "t_uint256",
                 "offset": 0,
                 "slot": "1"
               },
@@ -8191,57 +9914,51 @@
                 "slot": "2"
               },
               {
-                "label": "parameters",
-                "type": "t_struct(ProposalParameters)18581_storage",
+                "label": "startDate",
+                "type": "t_uint64",
                 "offset": 0,
                 "slot": "3"
               },
               {
-                "label": "actions",
-                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "3"
+              },
+              {
+                "label": "snapshotBlock",
+                "type": "t_uint64",
+                "offset": 16,
+                "slot": "3"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
                 "offset": 0,
                 "slot": "4"
               },
               {
-                "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18527_storage)",
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
                 "offset": 0,
                 "slot": "5"
               },
               {
-                "label": "committeeToTallyDatails",
-                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18547_storage)",
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18524_storage)",
                 "offset": 0,
                 "slot": "6"
-              }
-            ],
-            "numberOfBytes": "224"
-          },
-          "t_struct(ProposalParameters)18581_storage": {
-            "label": "struct DaofinPlugin.ProposalParameters",
-            "members": [
-              {
-                "label": "startDate",
-                "type": "t_uint64",
-                "offset": 0,
-                "slot": "0"
-              },
-              {
-                "label": "endDate",
-                "type": "t_uint64",
-                "offset": 8,
-                "slot": "0"
               },
               {
-                "label": "snapshotBlock",
-                "type": "t_uint64",
-                "offset": 16,
-                "slot": "0"
+                "label": "committeeToTallyDatails",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18540_storage)",
+                "offset": 0,
+                "slot": "7"
               }
             ],
-            "numberOfBytes": "32"
+            "numberOfBytes": "256"
           },
-          "t_struct(SnapshotAmount)18591_storage": {
+          "t_struct(SnapshotAmount)18582_storage": {
             "label": "struct DaofinPlugin.SnapshotAmount",
             "members": [
               {
@@ -8259,7 +9976,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(TallyDatails)18547_storage": {
+          "t_struct(TallyDatails)18540_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -8289,7 +10006,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18527_storage": {
+          "t_struct(VoteInfo)18524_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -8300,7 +10017,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18497",
+                "type": "t_enum(VoteOption)18503",
                 "offset": 1,
                 "slot": "0"
               }
@@ -8326,9 +10043,9 @@
         }
       }
     },
-    "9657f47c80c4e9231febe133f481dfe5a77d1cc5634e16325592476aecfada29": {
-      "address": "0xE92D669bF46a0387E1B2ba5F1b8AFBD3E156B14A",
-      "txHash": "0x75b4f1ec02c37da532c700361c5cf5c95eae95b360b1b62fcb24191dc8ae6a8e",
+    "cf4a2bcf416af090e201e1ac4ba0cdf31f7c48ed4ab8abdfc27e3e3816e4f979": {
+      "address": "0xAB7B2da4A4E268F92D55eb684ceB390d6596c9c0",
+      "txHash": "0x33ba15f9ed01047111cb99ff11e79b2768637161f70698fa89d7839453f3b237",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -8427,39 +10144,39 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:149"
+            "src": "src/DaofinPlugin.sol:136"
           },
           {
             "label": "_daofinGlobalSettings",
             "offset": 0,
             "slot": "352",
-            "type": "t_struct(DaofinGlobalSettings)18505_storage",
+            "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:152"
+            "src": "src/DaofinPlugin.sol:139"
           },
           {
             "label": "_proposals",
             "offset": 0,
             "slot": "354",
-            "type": "t_mapping(t_uint256,t_struct(Proposal)18569_storage)",
+            "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:155"
+            "src": "src/DaofinPlugin.sol:142"
           },
           {
             "label": "_committeesToVotingSettings",
             "offset": 0,
             "slot": "355",
-            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18516_storage)",
+            "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:161"
+            "src": "src/DaofinPlugin.sol:148"
           },
           {
             "label": "_voterToLockedAmounts",
             "offset": 0,
             "slot": "356",
-            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18586_storage)",
+            "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:167"
+            "src": "src/DaofinPlugin.sol:154"
           },
           {
             "label": "_judiciaryCommittee",
@@ -8467,7 +10184,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:178"
+            "src": "src/DaofinPlugin.sol:165"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -8475,15 +10192,15 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:179"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
             "label": "_masterNodeDelegatee",
             "offset": 0,
             "slot": "359",
-            "type": "t_struct(MasterNodeDelegateeMappings)18599_storage",
+            "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:183"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_committeesList",
@@ -8491,15 +10208,31 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:186"
+            "src": "src/DaofinPlugin.sol:173"
           },
           {
             "label": "_electionPeriods",
             "offset": 0,
             "slot": "364",
-            "type": "t_array(t_struct(ElectionPeriod)18581_storage)dyn_storage",
+            "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:189"
+            "src": "src/DaofinPlugin.sol:176"
+          },
+          {
+            "label": "proposalTypeCounter",
+            "offset": 0,
+            "slot": "365",
+            "type": "t_struct(Counter)3259_storage",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:179"
+          },
+          {
+            "label": "_proposalTypesToCommiteesVotingSettings",
+            "offset": 0,
+            "slot": "366",
+            "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:181"
           }
         ],
         "types": {
@@ -8519,7 +10252,7 @@
             "label": "struct IDAO.Action[]",
             "numberOfBytes": "32"
           },
-          "t_array(t_struct(ElectionPeriod)18581_storage)dyn_storage": {
+          "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod[]",
             "numberOfBytes": "32"
           },
@@ -8531,10 +10264,6 @@
             "label": "uint256[50]",
             "numberOfBytes": "1600"
           },
-          "t_array(t_uint256)dyn_storage": {
-            "label": "uint256[]",
-            "numberOfBytes": "32"
-          },
           "t_bool": {
             "label": "bool",
             "numberOfBytes": "1"
@@ -8551,11 +10280,11 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)20851": {
+          "t_contract(IXDCValidator)21075": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
-          "t_enum(VoteOption)18498": {
+          "t_enum(VoteOption)18503": {
             "label": "enum DaofinPlugin.VoteOption",
             "members": [
               "None",
@@ -8573,23 +10302,27 @@
             "label": "mapping(address => bool)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(SnapshotAmount)18586_storage)": {
+          "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)": {
             "label": "mapping(address => struct DaofinPlugin.SnapshotAmount)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_address,t_struct(VoteInfo)18522_storage)": {
+          "t_mapping(t_address,t_struct(VoteInfo)18524_storage)": {
             "label": "mapping(address => struct DaofinPlugin.VoteInfo)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18516_storage)": {
+          "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_bytes32,t_struct(TallyDatails)18542_storage)": {
+          "t_mapping(t_bytes32,t_struct(TallyDatails)18540_storage)": {
             "label": "mapping(bytes32 => struct DaofinPlugin.TallyDatails)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint256,t_struct(Proposal)18569_storage)": {
+          "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))": {
+            "label": "mapping(uint256 => mapping(bytes32 => struct DaofinPlugin.CommitteeVotingSettings))",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint256,t_struct(Proposal)18572_storage)": {
             "label": "mapping(uint256 => struct DaofinPlugin.Proposal)",
             "numberOfBytes": "32"
           },
@@ -8617,7 +10350,7 @@
             ],
             "numberOfBytes": "96"
           },
-          "t_struct(CommitteeVotingSettings)18516_storage": {
+          "t_struct(CommitteeVotingSettings)18518_storage": {
             "label": "struct DaofinPlugin.CommitteeVotingSettings",
             "members": [
               {
@@ -8638,12 +10371,6 @@
                 "offset": 4,
                 "slot": "1"
               },
-              {
-                "label": "minDuration",
-                "type": "t_uint64",
-                "offset": 8,
-                "slot": "1"
-              },
               {
                 "label": "minVotingPower",
                 "type": "t_uint256",
@@ -8665,25 +10392,25 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(DaofinGlobalSettings)18505_storage": {
+          "t_struct(DaofinGlobalSettings)18509_storage": {
             "label": "struct DaofinPlugin.DaofinGlobalSettings",
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)20851",
+                "type": "t_contract(IXDCValidator)21075",
                 "offset": 0,
                 "slot": "0"
               },
               {
-                "label": "allowedAmounts",
-                "type": "t_array(t_uint256)dyn_storage",
+                "label": "houseMinAmount",
+                "type": "t_uint256",
                 "offset": 0,
                 "slot": "1"
               }
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(ElectionPeriod)18581_storage": {
+          "t_struct(ElectionPeriod)18577_storage": {
             "label": "struct DaofinPlugin.ElectionPeriod",
             "members": [
               {
@@ -8701,7 +10428,7 @@
             ],
             "numberOfBytes": "32"
           },
-          "t_struct(MasterNodeDelegateeMappings)18599_storage": {
+          "t_struct(MasterNodeDelegateeMappings)18595_storage": {
             "label": "struct DaofinPlugin.MasterNodeDelegateeMappings",
             "members": [
               {
@@ -8731,7 +10458,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(Proposal)18569_storage": {
+          "t_struct(Proposal)18572_storage": {
             "label": "struct DaofinPlugin.Proposal",
             "members": [
               {
@@ -8747,8 +10474,8 @@
                 "slot": "0"
               },
               {
-                "label": "voters",
-                "type": "t_array(t_address)dyn_storage",
+                "label": "proposalTypeId",
+                "type": "t_uint256",
                 "offset": 0,
                 "slot": "1"
               },
@@ -8759,57 +10486,51 @@
                 "slot": "2"
               },
               {
-                "label": "parameters",
-                "type": "t_struct(ProposalParameters)18576_storage",
+                "label": "startDate",
+                "type": "t_uint64",
                 "offset": 0,
                 "slot": "3"
               },
               {
-                "label": "actions",
-                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
+                "label": "endDate",
+                "type": "t_uint64",
+                "offset": 8,
+                "slot": "3"
+              },
+              {
+                "label": "snapshotBlock",
+                "type": "t_uint64",
+                "offset": 16,
+                "slot": "3"
+              },
+              {
+                "label": "voters",
+                "type": "t_array(t_address)dyn_storage",
                 "offset": 0,
                 "slot": "4"
               },
               {
-                "label": "voterToInfo",
-                "type": "t_mapping(t_address,t_struct(VoteInfo)18522_storage)",
+                "label": "actions",
+                "type": "t_array(t_struct(Action)8275_storage)dyn_storage",
                 "offset": 0,
                 "slot": "5"
               },
               {
-                "label": "committeeToTallyDatails",
-                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18542_storage)",
+                "label": "voterToInfo",
+                "type": "t_mapping(t_address,t_struct(VoteInfo)18524_storage)",
                 "offset": 0,
                 "slot": "6"
-              }
-            ],
-            "numberOfBytes": "224"
-          },
-          "t_struct(ProposalParameters)18576_storage": {
-            "label": "struct DaofinPlugin.ProposalParameters",
-            "members": [
-              {
-                "label": "startDate",
-                "type": "t_uint64",
-                "offset": 0,
-                "slot": "0"
-              },
-              {
-                "label": "endDate",
-                "type": "t_uint64",
-                "offset": 8,
-                "slot": "0"
               },
               {
-                "label": "snapshotBlock",
-                "type": "t_uint64",
-                "offset": 16,
-                "slot": "0"
+                "label": "committeeToTallyDatails",
+                "type": "t_mapping(t_bytes32,t_struct(TallyDatails)18540_storage)",
+                "offset": 0,
+                "slot": "7"
               }
             ],
-            "numberOfBytes": "32"
+            "numberOfBytes": "256"
           },
-          "t_struct(SnapshotAmount)18586_storage": {
+          "t_struct(SnapshotAmount)18582_storage": {
             "label": "struct DaofinPlugin.SnapshotAmount",
             "members": [
               {
@@ -8827,7 +10548,7 @@
             ],
             "numberOfBytes": "64"
           },
-          "t_struct(TallyDatails)18542_storage": {
+          "t_struct(TallyDatails)18540_storage": {
             "label": "struct DaofinPlugin.TallyDatails",
             "members": [
               {
@@ -8857,7 +10578,7 @@
             ],
             "numberOfBytes": "128"
           },
-          "t_struct(VoteInfo)18522_storage": {
+          "t_struct(VoteInfo)18524_storage": {
             "label": "struct DaofinPlugin.VoteInfo",
             "members": [
               {
@@ -8868,7 +10589,7 @@
               },
               {
                 "label": "option",
-                "type": "t_enum(VoteOption)18498",
+                "type": "t_enum(VoteOption)18503",
                 "offset": 1,
                 "slot": "0"
               }
@@ -8894,9 +10615,9 @@
         }
       }
     },
-    "94952a8d324a51edbbb771cc7ef8c181cafb01874433d5b32413c5abe6386e9e": {
-      "address": "0x2661709488E7ddDe2506Ae1025961964708a86C6",
-      "txHash": "0x1efa19940767e01c5d3930d4e2e131b603595e6dcd2dd0b12e41b76adf6ac48a",
+    "e418610de2fcdbc4d02674619121fdcc32270da90391e74379ba499ed4d42662": {
+      "address": "0x74e551144c629388D3dAdf83701218b6E1Ef509C",
+      "txHash": "0x98248ee26b771c7fe3aeda53320858e8e486978f6abee3c4bb26e32d0b7936ab",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -8995,7 +10716,7 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:136"
+            "src": "src/DaofinPlugin.sol:137"
           },
           {
             "label": "_daofinGlobalSettings",
@@ -9003,7 +10724,7 @@
             "slot": "352",
             "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:139"
+            "src": "src/DaofinPlugin.sol:140"
           },
           {
             "label": "_proposals",
@@ -9011,7 +10732,7 @@
             "slot": "354",
             "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:142"
+            "src": "src/DaofinPlugin.sol:143"
           },
           {
             "label": "_committeesToVotingSettings",
@@ -9019,7 +10740,7 @@
             "slot": "355",
             "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:148"
+            "src": "src/DaofinPlugin.sol:149"
           },
           {
             "label": "_voterToLockedAmounts",
@@ -9027,7 +10748,7 @@
             "slot": "356",
             "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:154"
+            "src": "src/DaofinPlugin.sol:155"
           },
           {
             "label": "_judiciaryCommittee",
@@ -9035,7 +10756,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:165"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -9043,7 +10764,7 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:167"
           },
           {
             "label": "_masterNodeDelegatee",
@@ -9051,7 +10772,7 @@
             "slot": "359",
             "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:170"
+            "src": "src/DaofinPlugin.sol:171"
           },
           {
             "label": "_committeesList",
@@ -9059,7 +10780,7 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:173"
+            "src": "src/DaofinPlugin.sol:174"
           },
           {
             "label": "_electionPeriods",
@@ -9067,7 +10788,7 @@
             "slot": "364",
             "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:176"
+            "src": "src/DaofinPlugin.sol:177"
           },
           {
             "label": "proposalTypeCounter",
@@ -9075,7 +10796,7 @@
             "slot": "365",
             "type": "t_struct(Counter)3259_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:179"
+            "src": "src/DaofinPlugin.sol:180"
           },
           {
             "label": "_proposalTypesToCommiteesVotingSettings",
@@ -9083,7 +10804,7 @@
             "slot": "366",
             "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:181"
+            "src": "src/DaofinPlugin.sol:182"
           }
         ],
         "types": {
@@ -9131,7 +10852,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21073": {
+          "t_contract(IXDCValidator)21099": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -9248,7 +10969,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21073",
+                "type": "t_contract(IXDCValidator)21099",
                 "offset": 0,
                 "slot": "0"
               },
@@ -9466,9 +11187,9 @@
         }
       }
     },
-    "b01a6eb3aaa25076b9eb8e1acd40fe18c48c0e9b18b03c3860c5782cdb290425": {
-      "address": "0x49D6d6b9F5051e3F8E7492203e6772B0d3c7350c",
-      "txHash": "0x4160d5025a526cd838e79c14be310a7fd2192bc726905151290e9857d1de2553",
+    "c4e21d1cc7ce2d97cdfea9fe5754991840af9bcff1cd7863264e5db733df4c96": {
+      "address": "0x62Dc248F0499F6e6A8985a284326DD250d4c99C0",
+      "txHash": "0x50f758112a11ae0c5d3b8160ffab7df9c9719331c3f5e15ad8ee55250379fa5e",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -9567,7 +11288,7 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:136"
+            "src": "src/DaofinPlugin.sol:137"
           },
           {
             "label": "_daofinGlobalSettings",
@@ -9575,7 +11296,7 @@
             "slot": "352",
             "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:139"
+            "src": "src/DaofinPlugin.sol:140"
           },
           {
             "label": "_proposals",
@@ -9583,7 +11304,7 @@
             "slot": "354",
             "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:142"
+            "src": "src/DaofinPlugin.sol:143"
           },
           {
             "label": "_committeesToVotingSettings",
@@ -9591,7 +11312,7 @@
             "slot": "355",
             "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:148"
+            "src": "src/DaofinPlugin.sol:149"
           },
           {
             "label": "_voterToLockedAmounts",
@@ -9599,7 +11320,7 @@
             "slot": "356",
             "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:154"
+            "src": "src/DaofinPlugin.sol:155"
           },
           {
             "label": "_judiciaryCommittee",
@@ -9607,7 +11328,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:165"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -9615,7 +11336,7 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:167"
           },
           {
             "label": "_masterNodeDelegatee",
@@ -9623,7 +11344,7 @@
             "slot": "359",
             "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:170"
+            "src": "src/DaofinPlugin.sol:171"
           },
           {
             "label": "_committeesList",
@@ -9631,7 +11352,7 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:173"
+            "src": "src/DaofinPlugin.sol:174"
           },
           {
             "label": "_electionPeriods",
@@ -9639,7 +11360,7 @@
             "slot": "364",
             "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:176"
+            "src": "src/DaofinPlugin.sol:177"
           },
           {
             "label": "proposalTypeCounter",
@@ -9647,7 +11368,7 @@
             "slot": "365",
             "type": "t_struct(Counter)3259_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:179"
+            "src": "src/DaofinPlugin.sol:180"
           },
           {
             "label": "_proposalTypesToCommiteesVotingSettings",
@@ -9655,7 +11376,7 @@
             "slot": "366",
             "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:181"
+            "src": "src/DaofinPlugin.sol:182"
           }
         ],
         "types": {
@@ -9703,7 +11424,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21053": {
+          "t_contract(IXDCValidator)21096": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -9820,7 +11541,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21053",
+                "type": "t_contract(IXDCValidator)21096",
                 "offset": 0,
                 "slot": "0"
               },
@@ -10038,9 +11759,9 @@
         }
       }
     },
-    "cf4a2bcf416af090e201e1ac4ba0cdf31f7c48ed4ab8abdfc27e3e3816e4f979": {
-      "address": "0xAB7B2da4A4E268F92D55eb684ceB390d6596c9c0",
-      "txHash": "0x33ba15f9ed01047111cb99ff11e79b2768637161f70698fa89d7839453f3b237",
+    "95ace578882171080b7bd0b03ac0756bebc259097a977c12a71c0ca3b3804c6c": {
+      "address": "0xcFeB351E4231537e906aB52084Dfc9D03B6fC487",
+      "txHash": "0x10bbb82e9e26ed26598d5196cf6a815b8599606aec3ac326a278bd8e66527a03",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -10139,7 +11860,7 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:136"
+            "src": "src/DaofinPlugin.sol:137"
           },
           {
             "label": "_daofinGlobalSettings",
@@ -10147,7 +11868,7 @@
             "slot": "352",
             "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:139"
+            "src": "src/DaofinPlugin.sol:140"
           },
           {
             "label": "_proposals",
@@ -10155,7 +11876,7 @@
             "slot": "354",
             "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:142"
+            "src": "src/DaofinPlugin.sol:143"
           },
           {
             "label": "_committeesToVotingSettings",
@@ -10163,7 +11884,7 @@
             "slot": "355",
             "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:148"
+            "src": "src/DaofinPlugin.sol:149"
           },
           {
             "label": "_voterToLockedAmounts",
@@ -10171,7 +11892,7 @@
             "slot": "356",
             "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:154"
+            "src": "src/DaofinPlugin.sol:155"
           },
           {
             "label": "_judiciaryCommittee",
@@ -10179,7 +11900,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:165"
+            "src": "src/DaofinPlugin.sol:166"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -10187,7 +11908,7 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:167"
           },
           {
             "label": "_masterNodeDelegatee",
@@ -10195,7 +11916,7 @@
             "slot": "359",
             "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:170"
+            "src": "src/DaofinPlugin.sol:171"
           },
           {
             "label": "_committeesList",
@@ -10203,7 +11924,7 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:173"
+            "src": "src/DaofinPlugin.sol:174"
           },
           {
             "label": "_electionPeriods",
@@ -10211,7 +11932,7 @@
             "slot": "364",
             "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:176"
+            "src": "src/DaofinPlugin.sol:177"
           },
           {
             "label": "proposalTypeCounter",
@@ -10219,7 +11940,7 @@
             "slot": "365",
             "type": "t_struct(Counter)3259_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:179"
+            "src": "src/DaofinPlugin.sol:180"
           },
           {
             "label": "_proposalTypesToCommiteesVotingSettings",
@@ -10227,7 +11948,7 @@
             "slot": "366",
             "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:181"
+            "src": "src/DaofinPlugin.sol:182"
           }
         ],
         "types": {
@@ -10275,7 +11996,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21075": {
+          "t_contract(IXDCValidator)21092": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -10392,7 +12113,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21075",
+                "type": "t_contract(IXDCValidator)21092",
                 "offset": 0,
                 "slot": "0"
               },
@@ -10610,9 +12331,9 @@
         }
       }
     },
-    "e418610de2fcdbc4d02674619121fdcc32270da90391e74379ba499ed4d42662": {
-      "address": "0x74e551144c629388D3dAdf83701218b6E1Ef509C",
-      "txHash": "0x98248ee26b771c7fe3aeda53320858e8e486978f6abee3c4bb26e32d0b7936ab",
+    "7a4bc933b9625d560c25e40431eb4febf4f26b8644bd723ae9a6f4fad6140630": {
+      "address": "0x56c6d31034a11C0D5c0e72093a6eFF8bea6C38A8",
+      "txHash": "0x423d2cdd37d1f7b4148bf3db98d2d3b98e3f0388e7bbc0531d554e589009348d",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -10847,7 +12568,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21099": {
+          "t_contract(IXDCValidator)21100": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -10964,7 +12685,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21099",
+                "type": "t_contract(IXDCValidator)21100",
                 "offset": 0,
                 "slot": "0"
               },
@@ -11182,9 +12903,9 @@
         }
       }
     },
-    "c4e21d1cc7ce2d97cdfea9fe5754991840af9bcff1cd7863264e5db733df4c96": {
-      "address": "0x62Dc248F0499F6e6A8985a284326DD250d4c99C0",
-      "txHash": "0x50f758112a11ae0c5d3b8160ffab7df9c9719331c3f5e15ad8ee55250379fa5e",
+    "2469ba81f1438c68c2e9989644455c133f5691dbb920abad7a556b9a18ee76d6": {
+      "address": "0x0F4EcC65eB8e9A0981813a0702832EdF38dE768F",
+      "txHash": "0x4b7617c6402345db0d07f28a21c02c63c22f111d5dc11baeb1d228688ec044d3",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -11419,7 +13140,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21096": {
+          "t_contract(IXDCValidator)21092": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -11536,7 +13257,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21096",
+                "type": "t_contract(IXDCValidator)21092",
                 "offset": 0,
                 "slot": "0"
               },
@@ -11754,9 +13475,9 @@
         }
       }
     },
-    "95ace578882171080b7bd0b03ac0756bebc259097a977c12a71c0ca3b3804c6c": {
-      "address": "0xcFeB351E4231537e906aB52084Dfc9D03B6fC487",
-      "txHash": "0x10bbb82e9e26ed26598d5196cf6a815b8599606aec3ac326a278bd8e66527a03",
+    "daf4df41bb46ed1bd5840f382af0a6f762a8784c2628b58eb4f5bb328348e644": {
+      "address": "0x5A1E5c1e6821dc90964B2eCD809A3025E66E88CD",
+      "txHash": "0xe8ded64540b2d727ed45a6ac8b8158cb337f6f4558d4c3cd7641507a8208b777",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -11991,7 +13712,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21092": {
+          "t_contract(IXDCValidator)21093": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -12108,7 +13829,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21092",
+                "type": "t_contract(IXDCValidator)21093",
                 "offset": 0,
                 "slot": "0"
               },
@@ -12326,9 +14047,9 @@
         }
       }
     },
-    "7a4bc933b9625d560c25e40431eb4febf4f26b8644bd723ae9a6f4fad6140630": {
-      "address": "0x56c6d31034a11C0D5c0e72093a6eFF8bea6C38A8",
-      "txHash": "0x423d2cdd37d1f7b4148bf3db98d2d3b98e3f0388e7bbc0531d554e589009348d",
+    "b27be09664dcab8cd10b6276dadc85671b4094dee03e16c31dec14a5cecef142": {
+      "address": "0x7A1403A02012E714FaffdA4378C83F313741D842",
+      "txHash": "0x2dd282c14cd918e8b708aae6200e537b1d5a7fa5cd6a2c9ba35bc55dbcb011d9",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -12898,9 +14619,9 @@
         }
       }
     },
-    "2469ba81f1438c68c2e9989644455c133f5691dbb920abad7a556b9a18ee76d6": {
-      "address": "0x0F4EcC65eB8e9A0981813a0702832EdF38dE768F",
-      "txHash": "0x4b7617c6402345db0d07f28a21c02c63c22f111d5dc11baeb1d228688ec044d3",
+    "c9f3dcd1b1ec00d0f92bc7f7eb497334bb9104f47a4a8f0263041112c33342ec": {
+      "address": "0x264aeB333c9336Fc9C761F9BCe2be9ff5c4DC478",
+      "txHash": "0x7bdd1c4eeb1dae35fadd1571207d2eb0187a21a5d1c0ee54d5de05478e6518ae",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -13135,7 +14856,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21092": {
+          "t_contract(IXDCValidator)21088": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -13252,7 +14973,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21092",
+                "type": "t_contract(IXDCValidator)21088",
                 "offset": 0,
                 "slot": "0"
               },
@@ -13470,9 +15191,9 @@
         }
       }
     },
-    "daf4df41bb46ed1bd5840f382af0a6f762a8784c2628b58eb4f5bb328348e644": {
-      "address": "0x5A1E5c1e6821dc90964B2eCD809A3025E66E88CD",
-      "txHash": "0xe8ded64540b2d727ed45a6ac8b8158cb337f6f4558d4c3cd7641507a8208b777",
+    "6a64a2ef544d1ee70c604a1d2307749ad1eaec72606f2704a4bb4299052d9b59": {
+      "address": "0xBba424e42B1442Cf6fA5D1e6D964bc84C8a5EdFb",
+      "txHash": "0x563b1917f8cac81b12d47f0710515949c553f05a7bdd94a5a6108698fefafc8d",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -13707,7 +15428,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21093": {
+          "t_contract(IXDCValidator)21094": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -13824,7 +15545,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21093",
+                "type": "t_contract(IXDCValidator)21094",
                 "offset": 0,
                 "slot": "0"
               },
@@ -14042,9 +15763,9 @@
         }
       }
     },
-    "b27be09664dcab8cd10b6276dadc85671b4094dee03e16c31dec14a5cecef142": {
-      "address": "0x7A1403A02012E714FaffdA4378C83F313741D842",
-      "txHash": "0x2dd282c14cd918e8b708aae6200e537b1d5a7fa5cd6a2c9ba35bc55dbcb011d9",
+    "2f5a33d7653e6121b39c222082b247087afba3fe934cfe4e501d1edee8434b82": {
+      "address": "0x6863dD1ac9a800C576593125Cd6b588b7c8829d1",
+      "txHash": "0x9bbec505090759c0098751209715412228b95bf53f9be2fb15105a18f2b56d58",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -14279,7 +16000,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21100": {
+          "t_contract(IXDCValidator)21091": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -14396,7 +16117,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21100",
+                "type": "t_contract(IXDCValidator)21091",
                 "offset": 0,
                 "slot": "0"
               },
@@ -14614,9 +16335,9 @@
         }
       }
     },
-    "c9f3dcd1b1ec00d0f92bc7f7eb497334bb9104f47a4a8f0263041112c33342ec": {
-      "address": "0x264aeB333c9336Fc9C761F9BCe2be9ff5c4DC478",
-      "txHash": "0x7bdd1c4eeb1dae35fadd1571207d2eb0187a21a5d1c0ee54d5de05478e6518ae",
+    "0899444da14dca248c52ee30daa71bf45ae942f1b4a5cd6b806f50abb73d718c": {
+      "address": "0xA7135FB04206cb65851b10BA6d3302aceA90Dc04",
+      "txHash": "0xa400514aeea900bdb50ecc71933126b58e647b892e7a279bfc88af2cfa4fb3b0",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -14851,7 +16572,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21088": {
+          "t_contract(IXDCValidator)21094": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -14968,7 +16689,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21088",
+                "type": "t_contract(IXDCValidator)21094",
                 "offset": 0,
                 "slot": "0"
               },
@@ -15186,9 +16907,9 @@
         }
       }
     },
-    "6a64a2ef544d1ee70c604a1d2307749ad1eaec72606f2704a4bb4299052d9b59": {
-      "address": "0xBba424e42B1442Cf6fA5D1e6D964bc84C8a5EdFb",
-      "txHash": "0x563b1917f8cac81b12d47f0710515949c553f05a7bdd94a5a6108698fefafc8d",
+    "6c86cf18ce8584f6f8f3258f5a7a82f5c5ffeb00a0cf6666448cc3b640541ed3": {
+      "address": "0x5583BDfEE186eD83FaD30C517403aDc68202B3bB",
+      "txHash": "0xbef3b03ad2ac72b09a0f8cac0574306e28da8f16e331498144d0f89828ae5e78",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -15423,7 +17144,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21094": {
+          "t_contract(IXDCValidator)21085": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -15540,7 +17261,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21094",
+                "type": "t_contract(IXDCValidator)21085",
                 "offset": 0,
                 "slot": "0"
               },
@@ -15758,9 +17479,9 @@
         }
       }
     },
-    "2f5a33d7653e6121b39c222082b247087afba3fe934cfe4e501d1edee8434b82": {
-      "address": "0x6863dD1ac9a800C576593125Cd6b588b7c8829d1",
-      "txHash": "0x9bbec505090759c0098751209715412228b95bf53f9be2fb15105a18f2b56d58",
+    "9b00b0a75cd1bc7d0b9ee09dbef3b19933978f4d23380316b7f927f413c9cb6d": {
+      "address": "0x61e88eb68cA4f4bf7621e3fE2201e133679b932E",
+      "txHash": "0x2e7fc930c3c7129ea7b67315891fdf67afa6ea36eed3de30f50c4dc00465b620",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -15995,7 +17716,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21091": {
+          "t_contract(IXDCValidator)21095": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -16112,7 +17833,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21091",
+                "type": "t_contract(IXDCValidator)21095",
                 "offset": 0,
                 "slot": "0"
               },
@@ -16330,9 +18051,9 @@
         }
       }
     },
-    "0899444da14dca248c52ee30daa71bf45ae942f1b4a5cd6b806f50abb73d718c": {
-      "address": "0xA7135FB04206cb65851b10BA6d3302aceA90Dc04",
-      "txHash": "0xa400514aeea900bdb50ecc71933126b58e647b892e7a279bfc88af2cfa4fb3b0",
+    "39a58194dd1be51d2a59027d145d0594b677aeaf454f00f0246e87147c8bda44": {
+      "address": "0xf42B5f49289931842ae1EdC2816B0D167E80c830",
+      "txHash": "0x08fb04fca4bb1e9d194090910b48e8d74a896cf8463c49dcb72b84e50e24edf8",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -16902,9 +18623,9 @@
         }
       }
     },
-    "6c86cf18ce8584f6f8f3258f5a7a82f5c5ffeb00a0cf6666448cc3b640541ed3": {
-      "address": "0x5583BDfEE186eD83FaD30C517403aDc68202B3bB",
-      "txHash": "0xbef3b03ad2ac72b09a0f8cac0574306e28da8f16e331498144d0f89828ae5e78",
+    "26e2af7e1e5a83a6ddc82442093cb28411b4cdf90cf675c7539ef54aaa74c7b7": {
+      "address": "0x8496c5C441Ea8f34396E6079608D87469088faF8",
+      "txHash": "0x435f8aefed2400eb55aeff56ceca3b70066d79885606e68f113409523fe835d6",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -17139,7 +18860,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21085": {
+          "t_contract(IXDCValidator)21093": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -17256,7 +18977,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21085",
+                "type": "t_contract(IXDCValidator)21093",
                 "offset": 0,
                 "slot": "0"
               },
@@ -17474,9 +19195,9 @@
         }
       }
     },
-    "9b00b0a75cd1bc7d0b9ee09dbef3b19933978f4d23380316b7f927f413c9cb6d": {
-      "address": "0x61e88eb68cA4f4bf7621e3fE2201e133679b932E",
-      "txHash": "0x2e7fc930c3c7129ea7b67315891fdf67afa6ea36eed3de30f50c4dc00465b620",
+    "17dac82353b481cf53bc2df6707743c97e6bd943eca4fd2756720763129920f2": {
+      "address": "0xb27Ca0b049712c844EBae8160b2A79fea17A4344",
+      "txHash": "0x1b885bf34286c809a6b3ca7d3e6a959ff6d6647e2dedc5352e926752fab9150f",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -17711,7 +19432,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21095": {
+          "t_contract(IXDCValidator)21101": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -17828,7 +19549,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21095",
+                "type": "t_contract(IXDCValidator)21101",
                 "offset": 0,
                 "slot": "0"
               },
@@ -18046,9 +19767,9 @@
         }
       }
     },
-    "39a58194dd1be51d2a59027d145d0594b677aeaf454f00f0246e87147c8bda44": {
-      "address": "0xf42B5f49289931842ae1EdC2816B0D167E80c830",
-      "txHash": "0x08fb04fca4bb1e9d194090910b48e8d74a896cf8463c49dcb72b84e50e24edf8",
+    "68f38ac563ab0366e7b90a8a4c3bfbb9d19ce9f0a09e748a1fb0e86aac3667ed": {
+      "address": "0x0E0e5ba4545388521D5c389dC4177B151c725bd3",
+      "txHash": "0xf71029fde35638b283969c857f2af1c0ba37968d21d6ec1cc48ae41fe6542457",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -18283,7 +20004,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21094": {
+          "t_contract(IXDCValidator)21100": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -18400,7 +20121,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21094",
+                "type": "t_contract(IXDCValidator)21100",
                 "offset": 0,
                 "slot": "0"
               },
@@ -18618,9 +20339,9 @@
         }
       }
     },
-    "26e2af7e1e5a83a6ddc82442093cb28411b4cdf90cf675c7539ef54aaa74c7b7": {
-      "address": "0x8496c5C441Ea8f34396E6079608D87469088faF8",
-      "txHash": "0x435f8aefed2400eb55aeff56ceca3b70066d79885606e68f113409523fe835d6",
+    "9dbd2027e7323564bfac4ebdff6238af434c74a30e16743eb1e0d83fc74c54a9": {
+      "address": "0xcdE3AaaA7d636245eF8736350A89A025BFC3B489",
+      "txHash": "0xe8950870ec4c1fdcd1347957eaf2a9004df6b4795e74e910c12eac454f6990b7",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -18719,7 +20440,7 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:137"
+            "src": "src/DaofinPlugin.sol:141"
           },
           {
             "label": "_daofinGlobalSettings",
@@ -18727,7 +20448,7 @@
             "slot": "352",
             "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:140"
+            "src": "src/DaofinPlugin.sol:144"
           },
           {
             "label": "_proposals",
@@ -18735,7 +20456,7 @@
             "slot": "354",
             "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:143"
+            "src": "src/DaofinPlugin.sol:147"
           },
           {
             "label": "_committeesToVotingSettings",
@@ -18743,7 +20464,7 @@
             "slot": "355",
             "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:149"
+            "src": "src/DaofinPlugin.sol:153"
           },
           {
             "label": "_voterToLockedAmounts",
@@ -18751,7 +20472,7 @@
             "slot": "356",
             "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:155"
+            "src": "src/DaofinPlugin.sol:159"
           },
           {
             "label": "_judiciaryCommittee",
@@ -18759,7 +20480,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -18767,7 +20488,7 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:167"
+            "src": "src/DaofinPlugin.sol:171"
           },
           {
             "label": "_masterNodeDelegatee",
@@ -18775,7 +20496,7 @@
             "slot": "359",
             "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:171"
+            "src": "src/DaofinPlugin.sol:175"
           },
           {
             "label": "_committeesList",
@@ -18783,7 +20504,7 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:174"
+            "src": "src/DaofinPlugin.sol:178"
           },
           {
             "label": "_electionPeriods",
@@ -18791,7 +20512,7 @@
             "slot": "364",
             "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:177"
+            "src": "src/DaofinPlugin.sol:181"
           },
           {
             "label": "proposalTypeCounter",
@@ -18799,7 +20520,7 @@
             "slot": "365",
             "type": "t_struct(Counter)3259_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:180"
+            "src": "src/DaofinPlugin.sol:184"
           },
           {
             "label": "_proposalTypesToCommiteesVotingSettings",
@@ -18807,7 +20528,15 @@
             "slot": "366",
             "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:182"
+            "src": "src/DaofinPlugin.sol:186"
+          },
+          {
+            "label": "proposalCosts",
+            "offset": 0,
+            "slot": "367",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:189"
           }
         ],
         "types": {
@@ -18855,7 +20584,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21093": {
+          "t_contract(IXDCValidator)21225": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -18972,7 +20701,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21093",
+                "type": "t_contract(IXDCValidator)21225",
                 "offset": 0,
                 "slot": "0"
               },
@@ -19190,9 +20919,9 @@
         }
       }
     },
-    "17dac82353b481cf53bc2df6707743c97e6bd943eca4fd2756720763129920f2": {
-      "address": "0xb27Ca0b049712c844EBae8160b2A79fea17A4344",
-      "txHash": "0x1b885bf34286c809a6b3ca7d3e6a959ff6d6647e2dedc5352e926752fab9150f",
+    "d7c7060b9d9df5f620e4e5c6a14d0022e2c501e0c97542e949459eda170c01dd": {
+      "address": "0x865c1CadDedB978bD5E1405ea453e8c550882d68",
+      "txHash": "0x1fcdc039d15c6438f3b55fad9d373ba5eb64424554d21a58bfdd2c2cb530456b",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -19291,7 +21020,7 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:137"
+            "src": "src/DaofinPlugin.sol:141"
           },
           {
             "label": "_daofinGlobalSettings",
@@ -19299,7 +21028,7 @@
             "slot": "352",
             "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:140"
+            "src": "src/DaofinPlugin.sol:144"
           },
           {
             "label": "_proposals",
@@ -19307,7 +21036,7 @@
             "slot": "354",
             "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:143"
+            "src": "src/DaofinPlugin.sol:147"
           },
           {
             "label": "_committeesToVotingSettings",
@@ -19315,7 +21044,7 @@
             "slot": "355",
             "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:149"
+            "src": "src/DaofinPlugin.sol:153"
           },
           {
             "label": "_voterToLockedAmounts",
@@ -19323,7 +21052,7 @@
             "slot": "356",
             "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:155"
+            "src": "src/DaofinPlugin.sol:159"
           },
           {
             "label": "_judiciaryCommittee",
@@ -19331,7 +21060,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -19339,7 +21068,7 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:167"
+            "src": "src/DaofinPlugin.sol:171"
           },
           {
             "label": "_masterNodeDelegatee",
@@ -19347,7 +21076,7 @@
             "slot": "359",
             "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:171"
+            "src": "src/DaofinPlugin.sol:175"
           },
           {
             "label": "_committeesList",
@@ -19355,7 +21084,7 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:174"
+            "src": "src/DaofinPlugin.sol:178"
           },
           {
             "label": "_electionPeriods",
@@ -19363,7 +21092,7 @@
             "slot": "364",
             "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:177"
+            "src": "src/DaofinPlugin.sol:181"
           },
           {
             "label": "proposalTypeCounter",
@@ -19371,7 +21100,7 @@
             "slot": "365",
             "type": "t_struct(Counter)3259_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:180"
+            "src": "src/DaofinPlugin.sol:184"
           },
           {
             "label": "_proposalTypesToCommiteesVotingSettings",
@@ -19379,7 +21108,15 @@
             "slot": "366",
             "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:182"
+            "src": "src/DaofinPlugin.sol:186"
+          },
+          {
+            "label": "proposalCosts",
+            "offset": 0,
+            "slot": "367",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:189"
           }
         ],
         "types": {
@@ -19427,7 +21164,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21101": {
+          "t_contract(IXDCValidator)21228": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -19544,7 +21281,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21101",
+                "type": "t_contract(IXDCValidator)21228",
                 "offset": 0,
                 "slot": "0"
               },
@@ -19762,9 +21499,9 @@
         }
       }
     },
-    "68f38ac563ab0366e7b90a8a4c3bfbb9d19ce9f0a09e748a1fb0e86aac3667ed": {
-      "address": "0x0E0e5ba4545388521D5c389dC4177B151c725bd3",
-      "txHash": "0xf71029fde35638b283969c857f2af1c0ba37968d21d6ec1cc48ae41fe6542457",
+    "fbb79dc79d5bf73ae10f6020ccb6e1f81353a64f1b56c9ef251488ad54c5b47a": {
+      "address": "0xcD06a2B1aEED5aF0FD5A97c357e7eCE0fd5e988E",
+      "txHash": "0x06800822391ab8d746161543a411c839658ed2e316ac2e505ceb0a374180873d",
       "layout": {
         "solcVersion": "0.8.17",
         "storage": [
@@ -19863,7 +21600,7 @@
             "slot": "351",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:137"
+            "src": "src/DaofinPlugin.sol:141"
           },
           {
             "label": "_daofinGlobalSettings",
@@ -19871,7 +21608,7 @@
             "slot": "352",
             "type": "t_struct(DaofinGlobalSettings)18509_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:140"
+            "src": "src/DaofinPlugin.sol:144"
           },
           {
             "label": "_proposals",
@@ -19879,7 +21616,7 @@
             "slot": "354",
             "type": "t_mapping(t_uint256,t_struct(Proposal)18572_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:143"
+            "src": "src/DaofinPlugin.sol:147"
           },
           {
             "label": "_committeesToVotingSettings",
@@ -19887,7 +21624,7 @@
             "slot": "355",
             "type": "t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:149"
+            "src": "src/DaofinPlugin.sol:153"
           },
           {
             "label": "_voterToLockedAmounts",
@@ -19895,7 +21632,7 @@
             "slot": "356",
             "type": "t_mapping(t_address,t_struct(SnapshotAmount)18582_storage)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:155"
+            "src": "src/DaofinPlugin.sol:159"
           },
           {
             "label": "_judiciaryCommittee",
@@ -19903,7 +21640,7 @@
             "slot": "357",
             "type": "t_mapping(t_address,t_bool)",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:166"
+            "src": "src/DaofinPlugin.sol:170"
           },
           {
             "label": "_judiciaryCommitteeCount",
@@ -19911,7 +21648,7 @@
             "slot": "358",
             "type": "t_uint256",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:167"
+            "src": "src/DaofinPlugin.sol:171"
           },
           {
             "label": "_masterNodeDelegatee",
@@ -19919,7 +21656,7 @@
             "slot": "359",
             "type": "t_struct(MasterNodeDelegateeMappings)18595_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:171"
+            "src": "src/DaofinPlugin.sol:175"
           },
           {
             "label": "_committeesList",
@@ -19927,7 +21664,7 @@
             "slot": "363",
             "type": "t_array(t_bytes32)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:174"
+            "src": "src/DaofinPlugin.sol:178"
           },
           {
             "label": "_electionPeriods",
@@ -19935,7 +21672,7 @@
             "slot": "364",
             "type": "t_array(t_struct(ElectionPeriod)18577_storage)dyn_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:177"
+            "src": "src/DaofinPlugin.sol:181"
           },
           {
             "label": "proposalTypeCounter",
@@ -19943,7 +21680,7 @@
             "slot": "365",
             "type": "t_struct(Counter)3259_storage",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:180"
+            "src": "src/DaofinPlugin.sol:184"
           },
           {
             "label": "_proposalTypesToCommiteesVotingSettings",
@@ -19951,7 +21688,15 @@
             "slot": "366",
             "type": "t_mapping(t_uint256,t_mapping(t_bytes32,t_struct(CommitteeVotingSettings)18518_storage))",
             "contract": "DaofinPlugin",
-            "src": "src/DaofinPlugin.sol:182"
+            "src": "src/DaofinPlugin.sol:186"
+          },
+          {
+            "label": "proposalCosts",
+            "offset": 0,
+            "slot": "367",
+            "type": "t_uint256",
+            "contract": "DaofinPlugin",
+            "src": "src/DaofinPlugin.sol:189"
           }
         ],
         "types": {
@@ -19999,7 +21744,7 @@
             "label": "contract IDAO",
             "numberOfBytes": "20"
           },
-          "t_contract(IXDCValidator)21100": {
+          "t_contract(IXDCValidator)21226": {
             "label": "contract IXDCValidator",
             "numberOfBytes": "20"
           },
@@ -20116,7 +21861,7 @@
             "members": [
               {
                 "label": "xdcValidator",
-                "type": "t_contract(IXDCValidator)21100",
+                "type": "t_contract(IXDCValidator)21226",
                 "offset": 0,
                 "slot": "0"
               },
diff --git a/packages/contracts/deploy/03_create_dao/01_create_dao.ts b/packages/contracts/deploy/03_create_dao/01_create_dao.ts
index 3e70bf3..6b537bb 100644
--- a/packages/contracts/deploy/03_create_dao/01_create_dao.ts
+++ b/packages/contracts/deploy/03_create_dao/01_create_dao.ts
@@ -109,10 +109,11 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
       ],
     ],
     [
-      Math.floor(new Date().getTime() / 1000),
       Math.floor(new Date().getTime() / 1000) + 60 * 1000 * 60,
+      Math.floor(new Date().getTime() / 1000) + 60 * 1000 * 80,
     ],
     daoParams.judiciaryList,
+    parseEther('1'),
   ];
   const plugins = [
     {
diff --git a/packages/contracts/hardhat.config.ts b/packages/contracts/hardhat.config.ts
index bee877c..35bc956 100644
--- a/packages/contracts/hardhat.config.ts
+++ b/packages/contracts/hardhat.config.ts
@@ -29,7 +29,7 @@ const apiUrls: NetworkNameMapping = {
   goerli: 'https://goerli.infura.io/v3/',
   polygon: 'https://polygon-testnet.public.blastapi.io',
   polygonMumbai: 'https://rpc.ankr.com/polygon_mumbai',
-  apothem: 'https://erpc.apothem.network',
+  apothem: 'https://earpc.apothem.network',
   xdc: 'https://erpc.xinfin.network',
 };
 
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 6b0b4e9..2068441 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -2,7 +2,7 @@
   "name": "@xinfin/osx-daofin-contracts",
   "license": "AGPL-3.0-or-later",
   "description": "",
-  "version": "0.10.5",
+  "version": "0.10.7",
   "author": {
     "name": "aragon",
     "url": "https://github.com/aragon"
diff --git a/packages/contracts/plugin-info.json b/packages/contracts/plugin-info.json
index d153dc5..a5059c7 100644
--- a/packages/contracts/plugin-info.json
+++ b/packages/contracts/plugin-info.json
@@ -1,28 +1,28 @@
 {
   "apothem": {
-    "repo": "beny-plugin-repo-beta-1001",
-    "address": "0x74Fc8C0d04658940279c5F4f5F4758b9067f7e2E",
+    "repo": "beny-plugin-repo-beta-3000",
+    "address": "0x502C8B0Fd2ea16b7D4ECf1D4E9aD7d51Ce0Dd251",
     "args": [],
-    "blockNumberOfDeployment": 58359945,
+    "blockNumberOfDeployment": 58952824,
     "releases": {
       "1": {
         "builds": {
           "1": {
             "setup": {
               "name": "DaofinPluginSetup",
-              "address": "0x62Dc248F0499F6e6A8985a284326DD250d4c99C0",
+              "address": "0x275416d9E7464D7341127Ef96ad51513e4ce554d",
               "args": [],
-              "blockNumberOfDeployment": 58359947
+              "blockNumberOfDeployment": 58952826
             },
             "implementation": {
               "name": "DaofinPlugin",
-              "address": "0xbe8450a977B1d17bf518117E1B13C5E3143634a6",
+              "address": "0x5478f3FbAde40A17d4B9f51fDe5db4793E39902d",
               "args": [],
-              "blockNumberOfDeployment": 58359947
+              "blockNumberOfDeployment": 58952826
             },
             "helpers": [],
-            "buildMetadataURI": "ipfs://QmV3XAX9eniRBeipi2n4dA6EqT4JaUSaTE5ftnVnoYApiv",
-            "blockNumberOfPublication": 58359950
+            "buildMetadataURI": "ipfs://QmW1gUZqJo5mTfQUfDwVSWa4meZeb7z14APpG9vK5puoCS",
+            "blockNumberOfPublication": 58952830
           }
         },
         "releaseMetadataURI": "ipfs://QmbJWAESqCsf4RFCqEY7jecCashj8usXiyDNfKtZCwwzGb"
diff --git a/packages/contracts/plugin-settings.ts b/packages/contracts/plugin-settings.ts
index a37a2ec..a2eb829 100644
--- a/packages/contracts/plugin-settings.ts
+++ b/packages/contracts/plugin-settings.ts
@@ -2,7 +2,7 @@ import daofinBuildMetadata from './src/build-metadata.json';
 import daofinReleaseMetadata from './src/release-metadata.json';
 
 export const DaofinPluginSetupParams: PluginSetupParams = {
-  PLUGIN_REPO_ENS_NAME: 'beny-plugin-repo-beta-1001',
+  PLUGIN_REPO_ENS_NAME: 'beny-plugin-repo-beta-3000',
   PLUGIN_CONTRACT_NAME: 'DaofinPlugin',
   PLUGIN_SETUP_CONTRACT_NAME: 'DaofinPluginSetup',
   VERSION: {
diff --git a/packages/contracts/src/DaofinPlugin.sol b/packages/contracts/src/DaofinPlugin.sol
index fa459e6..c0c7883 100644
--- a/packages/contracts/src/DaofinPlugin.sol
+++ b/packages/contracts/src/DaofinPlugin.sol
@@ -118,6 +118,8 @@ contract DaofinPlugin is
 
     bytes32 public constant CREATE_PROPOSAL_TYPE_PERMISSION =
         keccak256("CREATE_PROPOSAL_TYPE_PERMISSION");
+    bytes32 public constant UPDATE_PROPOSAL_COSTS_PERMISSION =
+        keccak256("UPDATE_PROPOSAL_COSTS_PERMISSION");
 
     event JudiciaryChanged(address _member, uint256 _action); // action: 0 = Add, 1 = Remove
     event ElectionPeriodUpdated(uint64 _start, uint64 _end);
@@ -132,6 +134,8 @@ contract DaofinPlugin is
     event ProposalTypeCreated(uint256 _proposalType, CommitteeVotingSettings[] _settings);
     event HouseMinAmountUpdated(uint256 _newAmount);
     event ProposalIdToProposalTypeIdAttached(uint256 _proposalId, uint256 _proposalTypeId);
+    event ProposalCostsUpdated(uint256 _newValue);
+    event ProposalCostsReceived(uint256 _proposalId, address _proposer, uint256 _cost);
 
     // A rate limiter on creation of proposal
     uint256 lastProposalBlockNumber;
@@ -182,6 +186,8 @@ contract DaofinPlugin is
     mapping(uint256 => mapping(bytes32 => CommitteeVotingSettings))
         private _proposalTypesToCommiteesVotingSettings;
 
+    uint256 public proposalCosts;
+
     function joinHouse() external payable returns (bool) {
         address _member = _msgSender();
         uint256 _value = msg.value;
@@ -216,7 +222,8 @@ contract DaofinPlugin is
         CommitteeVotingSettings[] memory grantSettings_,
         CommitteeVotingSettings[] memory generalSettings_,
         uint64[] memory electionPeriod_,
-        address[] calldata judiciaries_
+        address[] calldata judiciaries_,
+        uint256 proposalCosts_
     ) external initializer {
         __PluginUUPSUpgradeable_init(_dao);
 
@@ -232,13 +239,16 @@ contract DaofinPlugin is
         // Assign and check Election period
         for (uint256 i; i < electionPeriod_.length; i++) {
             uint64 _startDate = electionPeriod_[i];
-            uint64 _endDate = electionPeriod_[i] + 1 weeks;
+            uint64 _endDate = electionPeriod_[i] + 2 weeks;
 
             _electionPeriods.push(ElectionPeriod(_startDate, _endDate));
 
             emit ElectionPeriodUpdated(_startDate, _endDate);
         }
 
+        proposalCosts = proposalCosts_;
+        emit ProposalCostsUpdated(proposalCosts_);
+
         _committeesList.push(MasterNodeCommittee);
         _committeesList.push(PeoplesHouseCommittee);
         _committeesList.push(JudiciaryCommittee);
@@ -257,6 +267,9 @@ contract DaofinPlugin is
         // 4 = proposalType - Judiciary Replacement
         _createProposalType(generalSettings_);
 
+        // 5 = proposalCosts - Proposal Costs
+        _createProposalType(generalSettings_);
+
         _addJudiciaryMember(judiciaries_);
 
         _settings.houseMinAmount = allowedAmount_;
@@ -272,7 +285,9 @@ contract DaofinPlugin is
         virtual
         override(ERC165Upgradeable, PluginUUPSUpgradeable, ProposalUpgradeable)
         returns (bool)
-    {}
+    {
+        return true;
+    }
 
     function getGlobalSettings() public view returns (DaofinGlobalSettings memory) {
         return _daofinGlobalSettings;
@@ -299,16 +314,14 @@ contract DaofinPlugin is
         uint256 _proposalType,
         uint256 _allowFailureMap,
         VoteOption _voteOption
-    ) external returns (uint256 _proposalId) {
+    ) external payable returns (uint256 _proposalId) {
         address proposer = _msgSender();
 
-        require(proposalTypeCount() > _proposalType);
-
-        uint64 _startDate = _electionPeriods[_electionPeriodIndex].startDate;
-        uint64 _endDate = _electionPeriods[_electionPeriodIndex].endDate;
+        _checkProposalCostsAndTransfer();
 
-        if (block.timestamp.toUint64() > _endDate) revert();
+        require(proposalTypeCount() > _proposalType);
 
+        (uint64 _startDate, uint64 _endDate) = _checkElectionPeriod(_electionPeriodIndex);
         _proposalId = _createProposal(
             proposer,
             _metadata,
@@ -317,15 +330,11 @@ contract DaofinPlugin is
             _actions,
             _allowFailureMap
         );
+        _proposals[_proposalId].proposalTypeId = _proposalType;
         emit ProposalIdToProposalTypeIdAttached(_proposalId, _proposalType);
         // Boom.. done.
 
-        bytes32 commitee = findCommitteeName(proposer);
-        if (commitee != bytes32(0) && _voteOption != VoteOption.None) {
-            _updateVote(_proposalType, _proposalId, proposer, commitee, _voteOption);
-
-            emit VoteReceived(_proposalId, proposer, commitee, _voteOption);
-        }
+        _updateVote(_proposalType, _proposalId, proposer, _voteOption);
     }
 
     function _createProposal(
@@ -371,16 +380,21 @@ contract DaofinPlugin is
         uint256 proposalTypeId_,
         uint256 proposalId_,
         address voter_,
-        bytes32 committee_,
         VoteOption voteOption_
     ) private {
+        bytes32 committee = findCommitteeName(voter_);
+
+        if (voteOption_ == VoteOption.None) return;
+
+        if (committee == bytes32(0)) revert("Daofin: invalid voter");
+
         CommitteeVotingSettings memory cvs = getCommitteesToVotingSettings(
             proposalTypeId_,
-            committee_
+            committee
         );
-        TallyDatails memory td = getProposalTallyDetails(proposalId_, committee_);
+        TallyDatails memory td = getProposalTallyDetails(proposalId_, committee);
 
-        if (committee_ == PeoplesHouseCommittee) {
+        if (committee == PeoplesHouseCommittee) {
             if (_voterToLockedAmounts[voter_].amount >= getGlobalSettings().houseMinAmount) {
                 uint256 votingPower = _voterToLockedAmounts[voter_].amount;
                 if (voteOption_ == VoteOption.Yes) {
@@ -402,9 +416,11 @@ contract DaofinPlugin is
                 td.abstain += cvs.minVotingPower;
             }
         }
-        _proposals[proposalId_].committeeToTallyDatails[committee_] = td;
+        _proposals[proposalId_].committeeToTallyDatails[committee] = td;
         _proposals[proposalId_].voters.push(voter_);
         _proposals[proposalId_].voterToInfo[voter_] = VoteInfo(true, voteOption_);
+
+        emit VoteReceived(proposalId_, voter_, committee, voteOption_);
     }
 
     function vote(uint256 _proposalId, VoteOption _voteOption, bool _tryEarlyExecution) external {
@@ -412,7 +428,7 @@ contract DaofinPlugin is
         address voter = _msgSender();
 
         // retrieve proposal Object
-        (bool open, , address proposer, uint256 proposalTypeId) = getProposal(_proposalId);
+        (bool open, , , uint256 proposalTypeId) = getProposal(_proposalId);
         // check if is not open, revert()
         if (!open) revert("Daofin: it is not open");
         // if (proposer == voter) revert("Daofin: voter cannot vote on the proposal");
@@ -423,12 +439,7 @@ contract DaofinPlugin is
         // Check if the supplied amount is in the range of specified values - 0 is place holder
         // if (!isAllowedAmount(voter, 0)) revert("Daofin: deposit first");
 
-        bytes32 committee = findCommitteeName(voter);
-        if (committee == bytes32(0)) revert("Daofin: invalid voter");
-
-        _updateVote(proposalTypeId, _proposalId, voter, committee, _voteOption);
-
-        emit VoteReceived(_proposalId, voter, committee, _voteOption);
+        _updateVote(proposalTypeId, _proposalId, voter, _voteOption);
     }
 
     function execute(uint256 _proposalId) external {
@@ -446,8 +457,8 @@ contract DaofinPlugin is
         return _proposals[_proposalId].voterToInfo[_voter].voted;
     }
 
-    function isAllowedAmount(uint256 balance) private view returns (bool isValid) {
-        if (balance == 0) isValid = false;
+    function isAllowedAmount(uint256 balance) private view returns (bool) {
+        if (balance == 0) return false;
         return getGlobalSettings().houseMinAmount >= balance;
     }
 
@@ -640,6 +651,30 @@ contract DaofinPlugin is
         _masterNodeDelegatee.delegateeToMasterNode[delegatee_] = masterNode_;
     }
 
+    function updateProposalCosts(
+        uint256 _newValue
+    ) external auth(UPDATE_PROPOSAL_COSTS_PERMISSION) {
+        require(_newValue > 0);
+        proposalCosts = _newValue;
+        emit ProposalCostsUpdated(_newValue);
+    }
+
+    function _checkElectionPeriod(uint256 _electionIndex) private view returns (uint64, uint64) {
+        uint64 _startDate = _electionPeriods[_electionIndex].startDate;
+        uint64 _endDate = _electionPeriods[_electionIndex].endDate;
+
+        require(_startDate != 0 || _endDate != 0);
+        if (block.timestamp.toUint64() > _startDate) revert();
+
+        return (_startDate, _endDate);
+    }
+
+    function _checkProposalCostsAndTransfer() private {
+        require(msg.value == proposalCosts, "");
+        (bool success, ) = address(dao()).call{value: msg.value}("");
+        require(success, "Daofin: failed");
+    }
+
     function isMasterNodeDelegatee(address delegatee_) public view returns (bool isValid) {
         if (delegatee_ == address(0)) return false;
 
diff --git a/packages/contracts/src/DaofinPluginSetup.sol b/packages/contracts/src/DaofinPluginSetup.sol
index 20b678a..c916fcd 100644
--- a/packages/contracts/src/DaofinPluginSetup.sol
+++ b/packages/contracts/src/DaofinPluginSetup.sol
@@ -28,7 +28,8 @@ contract DaofinPluginSetup is PluginSetup {
             DaofinPlugin.CommitteeVotingSettings[] memory committeeVotingSettings,
             DaofinPlugin.CommitteeVotingSettings[] memory generalCommitteeVotingSettings,
             uint64[] memory electionPeriods,
-            address[] memory judiciaries
+            address[] memory judiciaries,
+            uint256 proposalCosts
         ) = abi.decode(
                 _data,
                 (
@@ -37,7 +38,8 @@ contract DaofinPluginSetup is PluginSetup {
                     DaofinPlugin.CommitteeVotingSettings[],
                     DaofinPlugin.CommitteeVotingSettings[],
                     uint64[],
-                    address[]
+                    address[],
+                    uint256
                 )
             );
         // Deploy plugin proxy
@@ -51,12 +53,13 @@ contract DaofinPluginSetup is PluginSetup {
                 committeeVotingSettings,
                 generalCommitteeVotingSettings,
                 electionPeriods,
-                judiciaries
+                judiciaries,
+                proposalCosts
             )
         );
         // Prepare and set the needed permissions
         PermissionLib.MultiTargetPermission[]
-            memory permissions = new PermissionLib.MultiTargetPermission[](7);
+            memory permissions = new PermissionLib.MultiTargetPermission[](8);
 
         permissions[0] = PermissionLib.MultiTargetPermission(
             PermissionLib.Operation.Grant,
@@ -115,6 +118,14 @@ contract DaofinPluginSetup is PluginSetup {
             condition: PermissionLib.NO_CONDITION,
             permissionId: DAO(payable(_dao)).EXECUTE_PERMISSION_ID()
         });
+
+        permissions[7] = PermissionLib.MultiTargetPermission({
+            operation: PermissionLib.Operation.Grant,
+            where: plugin,
+            who: _dao,
+            condition: PermissionLib.NO_CONDITION,
+            permissionId: daofinPluginBase.UPDATE_PROPOSAL_COSTS_PERMISSION()
+        });
         preparedSetupData.permissions = permissions;
     }
 
diff --git a/packages/contracts/src/build-metadata.json b/packages/contracts/src/build-metadata.json
index ecc7e09..1169f70 100644
--- a/packages/contracts/src/build-metadata.json
+++ b/packages/contracts/src/build-metadata.json
@@ -77,6 +77,11 @@
           "internalType": "address[]",
           "name": "judiciaries_",
           "type": "address[]"
+        },
+        {
+          "internalType": "uint256",
+          "name": "proposalCosts",
+          "type": "uint256"
         }
       ],
       "prepareUpdate": "",
diff --git a/packages/contracts/test/helpers/utils.ts b/packages/contracts/test/helpers/utils.ts
index c11d3d0..9229bc5 100644
--- a/packages/contracts/test/helpers/utils.ts
+++ b/packages/contracts/test/helpers/utils.ts
@@ -1,7 +1,9 @@
 import {DaofinPlugin, DaofinPlugin__factory} from '../../typechain';
 import {PromiseOrValue} from '../../typechain/common';
+import {HardhatEthersHelpers} from '@nomiclabs/hardhat-ethers/types';
 import {IDAO} from '@xinfin/osx-ethers';
 import {BigNumber, BigNumberish, BytesLike} from 'ethers';
+import {ethers} from 'hardhat';
 
 export function createCommitteeVotingSettings(
   name: PromiseOrValue<BytesLike>,
@@ -73,3 +75,11 @@ export function applyRatioCeiled(
 
   return result;
 }
+
+export const advanceTime = async (
+  lib: typeof ethers & HardhatEthersHelpers,
+  seconds: number
+) => {
+  await lib.provider.send('evm_increaseTime', [seconds]);
+  await lib.provider.send('evm_mine', []);
+};
diff --git a/packages/contracts/test/unit-testing/daofin/create-proposal.test.ts b/packages/contracts/test/unit-testing/daofin/create-proposal.test.ts
index 780b38b..f4f4954 100644
--- a/packages/contracts/test/unit-testing/daofin/create-proposal.test.ts
+++ b/packages/contracts/test/unit-testing/daofin/create-proposal.test.ts
@@ -105,8 +105,9 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           parseEther('1')
         ),
       ],
-      [Math.floor(Date.now() / 1000)],
+      [Math.floor(new Date().getTime() / 1000) + 60 * 1000 * 60],
       [ADDRESS_ONE],
+      '10',
     ];
     await daofinPlugin.initialize(...initializeParams);
   });
@@ -115,18 +116,68 @@ describe(PLUGIN_CONTRACT_NAME, function () {
       createPropsalParams = createProposalParams(
         '0x00',
         [],
-        '1',
+        '0',
         '0',
         '0',
         '0'
       );
+      createPropsalParams[6] = {value: initializeParams[7].toString()};
 
       expect(await daofinPlugin.proposalCount()).to.be.eq(0);
       expect(await daofinPlugin.proposalCount()).to.not.be.eq(1);
+
       expect(await daofinPlugin.createProposal(...createPropsalParams)).to.not
         .reverted;
+
       expect(await daofinPlugin.proposalCount()).to.not.be.eq(0);
       expect(await daofinPlugin.proposalCount()).to.be.eq(1);
     });
+    it('proposalType must be set', async () => {
+      createPropsalParams = createProposalParams(
+        '0x00',
+        [],
+        '1',
+        '1',
+        '0',
+        '0'
+      );
+      createPropsalParams[6] = {value: initializeParams[7].toString()};
+
+      const proposalId = await daofinPlugin.callStatic.createProposal(
+        ...createPropsalParams
+      );
+      expect(await daofinPlugin.createProposal(...createPropsalParams)).to.not
+        .reverted;
+      expect(
+        (await daofinPlugin.getProposal(proposalId)).proposalTypeId
+      ).to.be.eq(1);
+      expect(await daofinPlugin.proposalCount()).to.be.eq(1);
+    });
+    it('proposalCost must be charged', async () => {
+      createPropsalParams = createProposalParams(
+        '0x00',
+        [],
+        '1',
+        '1',
+        '0',
+        '0'
+      );
+      createPropsalParams[6] = {value: initializeParams[7].toString()};
+
+      const daoBalanceBefore = await ethers.provider.getBalance(dao.address);
+
+      const proposalId = await daofinPlugin.callStatic.createProposal(
+        ...createPropsalParams
+      );
+      await daofinPlugin.createProposal(...createPropsalParams);
+      const daoBalanceAfter = await ethers.provider.getBalance(dao.address);
+
+      expect(daoBalanceAfter).to.be.greaterThan(daoBalanceBefore);
+
+      const isValid = daoBalanceAfter.eq(
+        daoBalanceBefore.add(initializeParams[7].toString())
+      );
+      expect(isValid).to.be.true;
+    });
   });
 });
diff --git a/packages/contracts/test/unit-testing/daofin/execute.test.ts b/packages/contracts/test/unit-testing/daofin/execute.test.ts
index 51a6a27..670faee 100644
--- a/packages/contracts/test/unit-testing/daofin/execute.test.ts
+++ b/packages/contracts/test/unit-testing/daofin/execute.test.ts
@@ -9,6 +9,7 @@ import {deployTestDao} from '../../helpers/test-dao';
 import {deployXDCValidator} from '../../helpers/test-xdc-validator';
 import {VoteOption} from '../../helpers/types';
 import {
+  advanceTime,
   applyRatioCeiled,
   createCommitteeVotingSettings,
   createProposalParams,
@@ -68,6 +69,7 @@ describe(PLUGIN_CONTRACT_NAME, function () {
   });
 
   describe('isMinParticipationReached()', () => {
+    let proposalId: BigNumber;
     beforeEach(async () => {
       daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
 
@@ -115,8 +117,9 @@ describe(PLUGIN_CONTRACT_NAME, function () {
             parseEther('1')
           ),
         ],
-        [Math.floor(Date.now() / 1000)],
+        [Math.floor(new Date().getTime() / 1000) + 600],
         [Bob.address],
+        '0',
       ];
       (await daofinPlugin.initialize(...initializeParams)).wait();
 
@@ -132,211 +135,29 @@ describe(PLUGIN_CONTRACT_NAME, function () {
         .updateOrJoinMasterNodeDelegatee(Tony.address);
 
       await daofinPlugin.joinHouse({value: parseEther('1')});
-    });
-    it('Judiciary Vote', async () => {
-      before(async () => {
-        initializeParams[3] = [
-          createCommitteeVotingSettings(
-            MasterNodeCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            PeoplesHouseCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            JudiciaryCommittee,
-            '100000',
-            '100000',
-            parseEther('1')
-          ),
-        ];
-      });
-      const voter = Bob;
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-      await proposalTx.wait();
-
-      const voteOption: VoteOption = VoteOption.Yes;
-
-      await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
-
-      const committeesList = await daofinPlugin.getCommitteesList();
-      for (const committee of committeesList) {
-        const settings = await daofinPlugin.getCommitteesToVotingSettings(
-          '0',
-          committee
-        );
-        const totalCommitteeNumber =
-          await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
 
-        const {yes, no, abstain} = await daofinPlugin.getProposalTallyDetails(
-          proposalId,
-          committee
-        );
-
-        const totalVotes = yes.add(no).add(abstain);
-
-        const isReached = totalVotes.gte(
-          applyRatioCeiled(
-            totalCommitteeNumber,
-            BigNumber.from(settings.minParticipation)
-          )
-        );
-
-        expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
-          isReached
-        );
-      }
-    });
-    it('Master Node Senate Vote', async () => {
-      const voter = Bob;
       createPropsalParams = createProposalParams(
         '0x00',
         [],
-        '1',
-        '0',
         '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-      await proposalTx.wait();
-
-      const voteOption: VoteOption = VoteOption.Yes;
-
-      await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
-
-      const committeesList = await daofinPlugin.getCommitteesList();
-      for (const committee of committeesList) {
-        const settings = await daofinPlugin.getCommitteesToVotingSettings(
-          '0',
-          committee
-        );
-        const totalCommitteeNumber =
-          await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
-
-        const {yes, no, abstain} = await daofinPlugin.getProposalTallyDetails(
-          proposalId,
-          committee
-        );
-
-        const totalVotes = yes.add(no).add(abstain);
-
-        const isReached = totalVotes.gte(
-          applyRatioCeiled(
-            totalCommitteeNumber,
-            BigNumber.from(settings.minParticipation)
-          )
-        );
-
-        expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
-          isReached,
-          committee
-        );
-      }
-    });
-    it('People Vote', async () => {
-      const voter = Alice;
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
         '0',
         '0',
         '0'
       );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
+      proposalId = await daofinPlugin.callStatic.createProposal(
         ...createPropsalParams
       );
       const proposalTx = await daofinPlugin
         .connect(Proposer)
         .createProposal(...createPropsalParams);
-      await proposalTx.wait();
 
-      const voteOption: VoteOption = VoteOption.No;
+      const reciept = await proposalTx.wait();
 
-      await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
-
-      const committeesList = await daofinPlugin.getCommitteesList();
-      for (const committee of committeesList) {
-        const settings = await daofinPlugin.getCommitteesToVotingSettings(
-          '0',
-          committee
-        );
-        const totalCommitteeNumber =
-          await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
-
-        const {yes, no, abstain} = await daofinPlugin.getProposalTallyDetails(
-          proposalId,
-          committee
-        );
-
-        const totalVotes = yes.add(no).add(abstain);
-
-        const isReached = totalVotes.gte(
-          applyRatioCeiled(
-            totalCommitteeNumber,
-            BigNumber.from(settings.minParticipation)
-          )
-        );
-
-        expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
-          isReached,
-          committee
-        );
-      }
+      await advanceTime(ethers, +initializeParams[5][0].toString() + 10);
     });
-  });
-  describe('isThresholdReached()', () => {
-    beforeEach(async () => {
-      daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
-
-      initializeParams = [
-        dao.address,
-        parseEther('1'),
-        xdcValidatorMock.address,
-        [
-          createCommitteeVotingSettings(
-            MasterNodeCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            PeoplesHouseCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            JudiciaryCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-        ],
-        [
+    it('Judiciary Vote', async () => {
+      before(async () => {
+        initializeParams[3] = [
           createCommitteeVotingSettings(
             MasterNodeCommittee,
             '0',
@@ -355,45 +176,9 @@ describe(PLUGIN_CONTRACT_NAME, function () {
             '100000',
             parseEther('1')
           ),
-        ],
-        [Math.floor(Date.now() / 1000)],
-        [Bob.address],
-      ];
-      (await daofinPlugin.initialize(...initializeParams)).wait();
-
-      await xdcValidatorMock.addCandidate(Mike.address);
-      await xdcValidatorMock.addCandidate(Beny.address);
-
-      await daofinPlugin
-        .connect(Mike)
-        .updateOrJoinMasterNodeDelegatee(John.address);
-
-      await daofinPlugin
-        .connect(Beny)
-        .updateOrJoinMasterNodeDelegatee(Tony.address);
-
-      await daofinPlugin.joinHouse({value: parseEther('1')});
-    });
-    afterEach(async () => {
-      await xdcValidatorMock.reset();
-    });
-    it('Judiciary Vote', async () => {
+        ];
+      });
       const voter = Bob;
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-      await proposalTx.wait();
 
       const voteOption: VoteOption = VoteOption.Yes;
 
@@ -413,7 +198,7 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           committee
         );
 
-        const totalVotes = yes;
+        const totalVotes = yes.add(no).add(abstain);
 
         const isReached = totalVotes.gte(
           applyRatioCeiled(
@@ -422,30 +207,14 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           )
         );
 
-        expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
+        expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
           isReached
         );
       }
     });
-    it('Master Node Vote', async () => {
-      const voter = John;
-
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
 
-      await proposalTx.wait();
+    it('Master Node Senate Vote', async () => {
+      const voter = Bob;
 
       const voteOption: VoteOption = VoteOption.Yes;
 
@@ -457,16 +226,15 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           '0',
           committee
         );
-
         const totalCommitteeNumber =
           await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
 
-        const {yes} = await daofinPlugin.getProposalTallyDetails(
+        const {yes, no, abstain} = await daofinPlugin.getProposalTallyDetails(
           proposalId,
           committee
         );
 
-        const totalVotes = yes;
+        const totalVotes = yes.add(no).add(abstain);
 
         const isReached = totalVotes.gte(
           applyRatioCeiled(
@@ -475,33 +243,17 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           )
         );
 
-        expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
+        expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
           isReached,
           committee
         );
       }
     });
+
     it('People Vote', async () => {
       const voter = Alice;
 
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-
-      await proposalTx.wait();
-
-      const voteOption: VoteOption = VoteOption.Yes;
+      const voteOption: VoteOption = VoteOption.No;
 
       await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
 
@@ -511,141 +263,6 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           '0',
           committee
         );
-
-        const totalCommitteeNumber =
-          await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
-
-        const {yes} = await daofinPlugin.getProposalTallyDetails(
-          proposalId,
-          committee
-        );
-
-        const totalVotes = yes;
-
-        const isReached = totalVotes.gte(
-          applyRatioCeiled(
-            totalCommitteeNumber,
-            BigNumber.from(settings.minParticipation)
-          )
-        );
-
-        expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
-          isReached,
-          committee
-        );
-      }
-    });
-  });
-
-  describe('CanExecute()', () => {
-    beforeEach(async () => {
-      daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
-
-      initializeParams = [
-        dao.address,
-        parseEther('1'),
-        xdcValidatorMock.address,
-        [
-          createCommitteeVotingSettings(
-            MasterNodeCommittee,
-            '500000',
-            '500000',
-            '1'
-          ),
-          createCommitteeVotingSettings(
-            PeoplesHouseCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            JudiciaryCommittee,
-            '100000',
-            '100000',
-            '1'
-          ),
-        ],
-        [
-          createCommitteeVotingSettings(
-            MasterNodeCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            PeoplesHouseCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            JudiciaryCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-        ],
-        [Math.floor(Date.now() / 1000)],
-        [Bob.address],
-      ];
-      (await daofinPlugin.initialize(...initializeParams)).wait();
-
-      await xdcValidatorMock.addCandidate(Mike.address);
-      await xdcValidatorMock.addCandidate(Beny.address);
-
-      await daofinPlugin
-        .connect(Mike)
-        .updateOrJoinMasterNodeDelegatee(John.address);
-
-      await daofinPlugin
-        .connect(Beny)
-        .updateOrJoinMasterNodeDelegatee(Tony.address);
-
-      await daofinPlugin.joinHouse({value: parseEther('1')});
-    });
-    afterEach(async () => {
-      await xdcValidatorMock.reset();
-    });
-    it('it must be able to execute', async () => {
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-      await proposalTx.wait();
-
-      const voteOption: VoteOption = VoteOption.Yes;
-      // People
-      await daofinPlugin.connect(Alice).vote(proposalId, voteOption, false);
-
-      // Jury
-      await daofinPlugin.connect(Bob).vote(proposalId, voteOption, false);
-
-      // Mn
-      //   await daofinPlugin.connect(John).vote(proposalId, voteOption, false);
-      await daofinPlugin.connect(Tony).vote(proposalId, voteOption, false);
-
-      const proposal = await daofinPlugin.getProposal(proposalId);
-
-      expect(proposal.open).be.true;
-
-      const committeesList = await daofinPlugin.getCommitteesList();
-
-      for (const committee of committeesList) {
-        const settings = await daofinPlugin.getCommitteesToVotingSettings(
-          '0',
-          committee
-        );
-
         const totalCommitteeNumber =
           await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
 
@@ -656,186 +273,550 @@ describe(PLUGIN_CONTRACT_NAME, function () {
 
         const totalVotes = yes.add(no).add(abstain);
 
-        const yesVotes = yes;
-
-        const isMinParticipationReached = totalVotes.gte(
+        const isReached = totalVotes.gte(
           applyRatioCeiled(
             totalCommitteeNumber,
             BigNumber.from(settings.minParticipation)
           )
         );
 
-        const isThresholdReached = yesVotes.gte(
-          applyRatioCeiled(
-            totalCommitteeNumber,
-            BigNumber.from(settings.supportThreshold)
-          )
-        );
-
         expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
-          isMinParticipationReached
-        );
-        expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
-          isThresholdReached
+          isReached,
+          committee
         );
-        expect(await daofinPlugin.canExecute(proposalId)).be.true;
       }
     });
-    it('it must not be able to execute', async () => {
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-      await proposalTx.wait();
-
-      const voteOption: VoteOption = VoteOption.Yes;
-      // People
-      await daofinPlugin.connect(Alice).vote(proposalId, voteOption, false);
-
-      // Jury
-      await daofinPlugin.connect(Bob).vote(proposalId, voteOption, false);
-
-      // No MNs
-
-      const proposal = await daofinPlugin.getProposal(proposalId);
-
-      expect(proposal.open).be.true;
-
-      expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.be
-        .false;
-      expect(await daofinPlugin.isThresholdReached(proposalId)).to.false;
-      expect(await daofinPlugin.canExecute(proposalId)).be.false;
-    });
   });
-  describe('Execute()', () => {
-    beforeEach(async () => {
-      daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
-
-      initializeParams = [
-        dao.address,
-        parseEther('1'),
-        xdcValidatorMock.address,
-        [
-          createCommitteeVotingSettings(
-            MasterNodeCommittee,
-            '500000',
-            '500000',
-            '1'
-          ),
-          createCommitteeVotingSettings(
-            PeoplesHouseCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            JudiciaryCommittee,
-            '100000',
-            '100000',
-            '1'
-          ),
-        ],
-        [
-          createCommitteeVotingSettings(
-            MasterNodeCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            PeoplesHouseCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-          createCommitteeVotingSettings(
-            JudiciaryCommittee,
-            '0',
-            '0',
-            parseEther('1')
-          ),
-        ],
-        [Math.floor(Date.now() / 1000)],
-        [Bob.address],
-      ];
-      (await daofinPlugin.initialize(...initializeParams)).wait();
-
-      await xdcValidatorMock.addCandidate(Mike.address);
-      await xdcValidatorMock.addCandidate(Beny.address);
-
-      await daofinPlugin
-        .connect(Mike)
-        .updateOrJoinMasterNodeDelegatee(John.address);
-
-      await daofinPlugin
-        .connect(Beny)
-        .updateOrJoinMasterNodeDelegatee(Tony.address);
 
-      await daofinPlugin.joinHouse({value: parseEther('1')});
-    });
-    afterEach(async () => {
-      await xdcValidatorMock.reset();
-    });
-    it('fire execute function', async () => {
-      const txHash = await Alice.sendTransaction({
-        to: dao.address,
-        value: parseEther('10'),
-      });
-
-      await dao.grant(dao.address, daofinPlugin.address, EXECUTE_PERMISSION_ID);
-
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [
-          {
-            data: new Uint8Array(),
-            value: BigInt(parseEther('1').toString()),
-            to: Proposer.address,
-          },
-        ],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-      await proposalTx.wait();
-
-      const voteOption: VoteOption = VoteOption.Yes;
-      // People
-      await daofinPlugin.connect(Alice).vote(proposalId, voteOption, false);
-
-      // Jury
-      await daofinPlugin.connect(Bob).vote(proposalId, voteOption, false);
-
-      // MNs
-      await daofinPlugin.connect(John).vote(proposalId, voteOption, false);
-      await daofinPlugin.connect(Tony).vote(proposalId, voteOption, false);
-
-      const proposal = await daofinPlugin.getProposal(proposalId);
-
-      expect(proposal.open).be.true;
-
-      expect(await daofinPlugin.canExecute(proposalId)).to.be.true;
-
-      (await daofinPlugin.execute(proposalId)).wait();
-
-      expect(proposal.executed).to.be.true;
-    });
-  });
+  // describe('isThresholdReached()', () => {
+  //   beforeEach(async () => {
+  //     daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
+
+  //     initializeParams = [
+  //       dao.address,
+  //       parseEther('1'),
+  //       xdcValidatorMock.address,
+  //       [
+  //         createCommitteeVotingSettings(
+  //           MasterNodeCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           PeoplesHouseCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           JudiciaryCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //       ],
+  //       [
+  //         createCommitteeVotingSettings(
+  //           MasterNodeCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           PeoplesHouseCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           JudiciaryCommittee,
+  //           '100000',
+  //           '100000',
+  //           parseEther('1')
+  //         ),
+  //       ],
+  //       [Math.floor(Date.now() / 1000)],
+  //       [Bob.address],
+  //     ];
+  //     (await daofinPlugin.initialize(...initializeParams)).wait();
+
+  //     await xdcValidatorMock.addCandidate(Mike.address);
+  //     await xdcValidatorMock.addCandidate(Beny.address);
+
+  //     await daofinPlugin
+  //       .connect(Mike)
+  //       .updateOrJoinMasterNodeDelegatee(John.address);
+
+  //     await daofinPlugin
+  //       .connect(Beny)
+  //       .updateOrJoinMasterNodeDelegatee(Tony.address);
+
+  //     await daofinPlugin.joinHouse({value: parseEther('1')});
+  //   });
+  //   afterEach(async () => {
+  //     await xdcValidatorMock.reset();
+  //   });
+  //   it('Judiciary Vote', async () => {
+  //     const voter = Bob;
+  //     createPropsalParams = createProposalParams(
+  //       '0x00',
+  //       [],
+  //       '1',
+  //       '0',
+  //       '0',
+  //       '0'
+  //     );
+  //     const proposalId = await daofinPlugin.callStatic.createProposal(
+  //       ...createPropsalParams
+  //     );
+  //     const proposalTx = await daofinPlugin
+  //       .connect(Proposer)
+  //       .createProposal(...createPropsalParams);
+  //     await proposalTx.wait();
+
+  //     const voteOption: VoteOption = VoteOption.Yes;
+
+  //     await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
+
+  //     const committeesList = await daofinPlugin.getCommitteesList();
+  //     for (const committee of committeesList) {
+  //       const settings = await daofinPlugin.getCommitteesToVotingSettings(
+  //         '0',
+  //         committee
+  //       );
+  //       const totalCommitteeNumber =
+  //         await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
+
+  //       const {yes, no, abstain} = await daofinPlugin.getProposalTallyDetails(
+  //         proposalId,
+  //         committee
+  //       );
+
+  //       const totalVotes = yes;
+
+  //       const isReached = totalVotes.gte(
+  //         applyRatioCeiled(
+  //           totalCommitteeNumber,
+  //           BigNumber.from(settings.minParticipation)
+  //         )
+  //       );
+
+  //       expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
+  //         isReached
+  //       );
+  //     }
+  //   });
+  //   it('Master Node Vote', async () => {
+  //     const voter = John;
+
+  //     createPropsalParams = createProposalParams(
+  //       '0x00',
+  //       [],
+  //       '1',
+  //       '0',
+  //       '0',
+  //       '0'
+  //     );
+  //     const proposalId = await daofinPlugin.callStatic.createProposal(
+  //       ...createPropsalParams
+  //     );
+  //     const proposalTx = await daofinPlugin
+  //       .connect(Proposer)
+  //       .createProposal(...createPropsalParams);
+
+  //     await proposalTx.wait();
+
+  //     const voteOption: VoteOption = VoteOption.Yes;
+
+  //     await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
+
+  //     const committeesList = await daofinPlugin.getCommitteesList();
+  //     for (const committee of committeesList) {
+  //       const settings = await daofinPlugin.getCommitteesToVotingSettings(
+  //         '0',
+  //         committee
+  //       );
+
+  //       const totalCommitteeNumber =
+  //         await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
+
+  //       const {yes} = await daofinPlugin.getProposalTallyDetails(
+  //         proposalId,
+  //         committee
+  //       );
+
+  //       const totalVotes = yes;
+
+  //       const isReached = totalVotes.gte(
+  //         applyRatioCeiled(
+  //           totalCommitteeNumber,
+  //           BigNumber.from(settings.minParticipation)
+  //         )
+  //       );
+
+  //       expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
+  //         isReached,
+  //         committee
+  //       );
+  //     }
+  //   });
+  //   it('People Vote', async () => {
+  //     const voter = Alice;
+
+  //     createPropsalParams = createProposalParams(
+  //       '0x00',
+  //       [],
+  //       '1',
+  //       '0',
+  //       '0',
+  //       '0'
+  //     );
+  //     const proposalId = await daofinPlugin.callStatic.createProposal(
+  //       ...createPropsalParams
+  //     );
+  //     const proposalTx = await daofinPlugin
+  //       .connect(Proposer)
+  //       .createProposal(...createPropsalParams);
+
+  //     await proposalTx.wait();
+
+  //     const voteOption: VoteOption = VoteOption.Yes;
+
+  //     await daofinPlugin.connect(voter).vote(proposalId, voteOption, false);
+
+  //     const committeesList = await daofinPlugin.getCommitteesList();
+  //     for (const committee of committeesList) {
+  //       const settings = await daofinPlugin.getCommitteesToVotingSettings(
+  //         '0',
+  //         committee
+  //       );
+
+  //       const totalCommitteeNumber =
+  //         await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
+
+  //       const {yes} = await daofinPlugin.getProposalTallyDetails(
+  //         proposalId,
+  //         committee
+  //       );
+
+  //       const totalVotes = yes;
+
+  //       const isReached = totalVotes.gte(
+  //         applyRatioCeiled(
+  //           totalCommitteeNumber,
+  //           BigNumber.from(settings.minParticipation)
+  //         )
+  //       );
+
+  //       expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
+  //         isReached,
+  //         committee
+  //       );
+  //     }
+  //   });
+  // });
+
+  // describe('CanExecute()', () => {
+  //   beforeEach(async () => {
+  //     daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
+
+  //     initializeParams = [
+  //       dao.address,
+  //       parseEther('1'),
+  //       xdcValidatorMock.address,
+  //       [
+  //         createCommitteeVotingSettings(
+  //           MasterNodeCommittee,
+  //           '500000',
+  //           '500000',
+  //           '1'
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           PeoplesHouseCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           JudiciaryCommittee,
+  //           '100000',
+  //           '100000',
+  //           '1'
+  //         ),
+  //       ],
+  //       [
+  //         createCommitteeVotingSettings(
+  //           MasterNodeCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           PeoplesHouseCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           JudiciaryCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //       ],
+  //       [Math.floor(Date.now() / 1000)],
+  //       [Bob.address],
+  //     ];
+  //     (await daofinPlugin.initialize(...initializeParams)).wait();
+
+  //     await xdcValidatorMock.addCandidate(Mike.address);
+  //     await xdcValidatorMock.addCandidate(Beny.address);
+
+  //     await daofinPlugin
+  //       .connect(Mike)
+  //       .updateOrJoinMasterNodeDelegatee(John.address);
+
+  //     await daofinPlugin
+  //       .connect(Beny)
+  //       .updateOrJoinMasterNodeDelegatee(Tony.address);
+
+  //     await daofinPlugin.joinHouse({value: parseEther('1')});
+  //   });
+  //   afterEach(async () => {
+  //     await xdcValidatorMock.reset();
+  //   });
+  //   it('it must be able to execute', async () => {
+  //     createPropsalParams = createProposalParams(
+  //       '0x00',
+  //       [],
+  //       '1',
+  //       '0',
+  //       '0',
+  //       '0'
+  //     );
+  //     const proposalId = await daofinPlugin.callStatic.createProposal(
+  //       ...createPropsalParams
+  //     );
+  //     const proposalTx = await daofinPlugin
+  //       .connect(Proposer)
+  //       .createProposal(...createPropsalParams);
+  //     await proposalTx.wait();
+
+  //     const voteOption: VoteOption = VoteOption.Yes;
+  //     // People
+  //     await daofinPlugin.connect(Alice).vote(proposalId, voteOption, false);
+
+  //     // Jury
+  //     await daofinPlugin.connect(Bob).vote(proposalId, voteOption, false);
+
+  //     // Mn
+  //     //   await daofinPlugin.connect(John).vote(proposalId, voteOption, false);
+  //     await daofinPlugin.connect(Tony).vote(proposalId, voteOption, false);
+
+  //     const proposal = await daofinPlugin.getProposal(proposalId);
+
+  //     expect(proposal.open).be.true;
+
+  //     const committeesList = await daofinPlugin.getCommitteesList();
+
+  //     for (const committee of committeesList) {
+  //       const settings = await daofinPlugin.getCommitteesToVotingSettings(
+  //         '0',
+  //         committee
+  //       );
+
+  //       const totalCommitteeNumber =
+  //         await daofinPlugin.getTotalNumberOfMembersByCommittee(committee);
+
+  //       const {yes, no, abstain} = await daofinPlugin.getProposalTallyDetails(
+  //         proposalId,
+  //         committee
+  //       );
+
+  //       const totalVotes = yes.add(no).add(abstain);
+
+  //       const yesVotes = yes;
+
+  //       const isMinParticipationReached = totalVotes.gte(
+  //         applyRatioCeiled(
+  //           totalCommitteeNumber,
+  //           BigNumber.from(settings.minParticipation)
+  //         )
+  //       );
+
+  //       const isThresholdReached = yesVotes.gte(
+  //         applyRatioCeiled(
+  //           totalCommitteeNumber,
+  //           BigNumber.from(settings.supportThreshold)
+  //         )
+  //       );
+
+  //       expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.eq(
+  //         isMinParticipationReached
+  //       );
+  //       expect(await daofinPlugin.isThresholdReached(proposalId)).to.eq(
+  //         isThresholdReached
+  //       );
+  //       expect(await daofinPlugin.canExecute(proposalId)).be.true;
+  //     }
+  //   });
+  //   it('it must not be able to execute', async () => {
+  //     createPropsalParams = createProposalParams(
+  //       '0x00',
+  //       [],
+  //       '1',
+  //       '0',
+  //       '0',
+  //       '0'
+  //     );
+  //     const proposalId = await daofinPlugin.callStatic.createProposal(
+  //       ...createPropsalParams
+  //     );
+  //     const proposalTx = await daofinPlugin
+  //       .connect(Proposer)
+  //       .createProposal(...createPropsalParams);
+  //     await proposalTx.wait();
+
+  //     const voteOption: VoteOption = VoteOption.Yes;
+  //     // People
+  //     await daofinPlugin.connect(Alice).vote(proposalId, voteOption, false);
+
+  //     // Jury
+  //     await daofinPlugin.connect(Bob).vote(proposalId, voteOption, false);
+
+  //     // No MNs
+
+  //     const proposal = await daofinPlugin.getProposal(proposalId);
+
+  //     expect(proposal.open).be.true;
+
+  //     expect(await daofinPlugin.isMinParticipationReached(proposalId)).to.be
+  //       .false;
+  //     expect(await daofinPlugin.isThresholdReached(proposalId)).to.false;
+  //     expect(await daofinPlugin.canExecute(proposalId)).be.false;
+  //   });
+  // });
+
+  // describe('Execute()', () => {
+  //   beforeEach(async () => {
+  //     daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
+
+  //     initializeParams = [
+  //       dao.address,
+  //       parseEther('1'),
+  //       xdcValidatorMock.address,
+  //       [
+  //         createCommitteeVotingSettings(
+  //           MasterNodeCommittee,
+  //           '500000',
+  //           '500000',
+  //           '1'
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           PeoplesHouseCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           JudiciaryCommittee,
+  //           '100000',
+  //           '100000',
+  //           '1'
+  //         ),
+  //       ],
+  //       [
+  //         createCommitteeVotingSettings(
+  //           MasterNodeCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           PeoplesHouseCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //         createCommitteeVotingSettings(
+  //           JudiciaryCommittee,
+  //           '0',
+  //           '0',
+  //           parseEther('1')
+  //         ),
+  //       ],
+  //       [Math.floor(Date.now() / 1000)],
+  //       [Bob.address],
+  //     ];
+  //     (await daofinPlugin.initialize(...initializeParams)).wait();
+
+  //     await xdcValidatorMock.addCandidate(Mike.address);
+  //     await xdcValidatorMock.addCandidate(Beny.address);
+
+  //     await daofinPlugin
+  //       .connect(Mike)
+  //       .updateOrJoinMasterNodeDelegatee(John.address);
+
+  //     await daofinPlugin
+  //       .connect(Beny)
+  //       .updateOrJoinMasterNodeDelegatee(Tony.address);
+
+  //     await daofinPlugin.joinHouse({value: parseEther('1')});
+  //   });
+  //   afterEach(async () => {
+  //     await xdcValidatorMock.reset();
+  //   });
+  //   it('fire execute function', async () => {
+  //     const txHash = await Alice.sendTransaction({
+  //       to: dao.address,
+  //       value: parseEther('10'),
+  //     });
+
+  //     await dao.grant(dao.address, daofinPlugin.address, EXECUTE_PERMISSION_ID);
+
+  //     createPropsalParams = createProposalParams(
+  //       '0x00',
+  //       [
+  //         {
+  //           data: new Uint8Array(),
+  //           value: BigInt(parseEther('1').toString()),
+  //           to: Proposer.address,
+  //         },
+  //       ],
+  //       '1',
+  //       '0',
+  //       '0',
+  //       '0'
+  //     );
+  //     const proposalId = await daofinPlugin.callStatic.createProposal(
+  //       ...createPropsalParams
+  //     );
+  //     const proposalTx = await daofinPlugin
+  //       .connect(Proposer)
+  //       .createProposal(...createPropsalParams);
+  //     await proposalTx.wait();
+
+  //     const voteOption: VoteOption = VoteOption.Yes;
+  //     // People
+  //     await daofinPlugin.connect(Alice).vote(proposalId, voteOption, false);
+
+  //     // Jury
+  //     await daofinPlugin.connect(Bob).vote(proposalId, voteOption, false);
+
+  //     // MNs
+  //     await daofinPlugin.connect(John).vote(proposalId, voteOption, false);
+  //     await daofinPlugin.connect(Tony).vote(proposalId, voteOption, false);
+
+  //     const proposal = await daofinPlugin.getProposal(proposalId);
+
+  //     expect(proposal.open).be.true;
+
+  //     expect(await daofinPlugin.canExecute(proposalId)).to.be.true;
+
+  //     (await daofinPlugin.execute(proposalId)).wait();
+
+  //     expect(proposal.executed).to.be.true;
+  //   });
+  // });
 });
diff --git a/packages/contracts/test/unit-testing/daofin/initialize.test.ts b/packages/contracts/test/unit-testing/daofin/initialize.test.ts
index f080131..572bcaa 100644
--- a/packages/contracts/test/unit-testing/daofin/initialize.test.ts
+++ b/packages/contracts/test/unit-testing/daofin/initialize.test.ts
@@ -118,8 +118,9 @@ describe(PLUGIN_CONTRACT_NAME, function () {
             parseEther('1')
           ),
         ],
-        [Math.floor(Date.now() / 1000)],
+        [Math.floor(new Date().getTime() / 1000) + 60 * 1000 * 60],
         [ADDRESS_ONE],
+        '10',
       ];
       await daofinPlugin.initialize(...initializeParams);
 
@@ -219,5 +220,13 @@ describe(PLUGIN_CONTRACT_NAME, function () {
         expect(judiciary).be.not.eq(XdcValidator);
       }
     });
+    it('proposalCosts must be set and be correct', async () => {
+      await daofinPlugin.initialize(...initializeParams);
+      const proposalCosts = await daofinPlugin.proposalCosts();
+
+      expect(proposalCosts.toString()).not.be.greaterThan(
+        parseEther(initializeParams[7].toString())
+      );
+    });
   });
 });
diff --git a/packages/contracts/test/unit-testing/daofin/vote.test.ts b/packages/contracts/test/unit-testing/daofin/vote.test.ts
index 687a83d..3ec5c71 100644
--- a/packages/contracts/test/unit-testing/daofin/vote.test.ts
+++ b/packages/contracts/test/unit-testing/daofin/vote.test.ts
@@ -64,16 +64,10 @@ describe(PLUGIN_CONTRACT_NAME, function () {
     xdcValidatorMock = await deployXDCValidator(Alice);
   });
 
-  beforeEach(async () => {
-    // await daofinPlugin
-    //   .connect(Mike)
-    //   .updateOrJoinMasterNodeDelegatee(John.address);
-    // await daofinPlugin
-    //   .connect(Beny)
-    //   .updateOrJoinMasterNodeDelegatee(Tony.address);
-  });
+  beforeEach(async () => {});
   describe('Jury: vote()', async () => {
-    before(async () => {
+    let proposalId: BigNumber;
+    beforeEach(async () => {
       daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
 
       initializeParams = [
@@ -120,49 +114,37 @@ describe(PLUGIN_CONTRACT_NAME, function () {
             parseEther('1')
           ),
         ],
-        [Math.floor(Date.now() / 1000)],
+        [Math.floor(new Date().getTime() / 1000) + 10],
         [Bob.address],
+        '0',
       ];
       (await daofinPlugin.initialize(...initializeParams)).wait();
-    });
-    it('must not be reverted', async () => {
-      const voter = Bob;
       createPropsalParams = createProposalParams(
         '0x00',
         [],
-        '1',
+        '0',
         '0',
         '0',
         '0'
       );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
+
+      proposalId = await daofinPlugin.callStatic.createProposal(
         ...createPropsalParams
       );
       const proposalTx = await daofinPlugin.createProposal(
         ...createPropsalParams
       );
       await proposalTx.wait();
+      await new Promise(res => setTimeout(d => res(d), 12000));
+    });
+    it('must not be reverted', async () => {
+      const voter = Bob;
 
       expect(await daofinPlugin.connect(voter).vote(proposalId, '2', false)).not
         .to.be.reverted;
     });
     it('must be reverted', async () => {
       const voter = Bob;
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin.createProposal(
-        ...createPropsalParams
-      );
-      await proposalTx.wait();
 
       await expect(
         daofinPlugin.connect(voter).vote(proposalId.add(1), '2', false)
@@ -171,22 +153,6 @@ describe(PLUGIN_CONTRACT_NAME, function () {
     it('Jury: must record in tally details', async () => {
       const voter = Bob;
 
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-      const proposalTx = await daofinPlugin.createProposal(
-        ...createPropsalParams
-      );
-      await proposalTx.wait();
-
       const voteOption: VoteOption = VoteOption.Yes;
       const voteCommittee = JudiciaryCommittee;
       const tallyBefore = await daofinPlugin.getProposalTallyDetails(
@@ -219,6 +185,8 @@ describe(PLUGIN_CONTRACT_NAME, function () {
         '0',
         '0'
       );
+      createPropsalParams[6] = {value: initializeParams[7].toString()};
+
       const proposalId = await daofinPlugin.callStatic.createProposal(
         ...createPropsalParams
       );
@@ -249,6 +217,7 @@ describe(PLUGIN_CONTRACT_NAME, function () {
     });
   });
   describe('People: vote()', async () => {
+    let proposalId: BigNumber;
     beforeEach(async () => {
       daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
 
@@ -296,8 +265,9 @@ describe(PLUGIN_CONTRACT_NAME, function () {
             parseEther('1')
           ),
         ],
-        [Math.floor(Date.now() / 1000)],
+        [Math.floor(new Date().getTime() / 1000) + 10],
         [Bob.address],
+        '0',
       ];
       (await daofinPlugin.initialize(...initializeParams)).wait();
 
@@ -306,9 +276,6 @@ describe(PLUGIN_CONTRACT_NAME, function () {
           value: parseEther('1'),
         })
       ).wait();
-    });
-    it('People: must record in tally details', async () => {
-      const voter = Alice;
       createPropsalParams = createProposalParams(
         '0x00',
         [],
@@ -317,14 +284,20 @@ describe(PLUGIN_CONTRACT_NAME, function () {
         '0',
         '0'
       );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
+      proposalId = await daofinPlugin.callStatic.createProposal(
         ...createPropsalParams
       );
 
       const proposalTx = await daofinPlugin
         .connect(Proposer)
         .createProposal(...createPropsalParams);
+
       await proposalTx.wait();
+      await new Promise(res => setTimeout(d => res(d), 12000));
+    });
+    it('People: must record in tally details', async () => {
+      const voter = Alice;
+
       const voteOption: VoteOption = VoteOption.Yes;
       const voteCommittee = PeoplesHouseCommittee;
       const tallyBefore = await daofinPlugin.getProposalTallyDetails(
@@ -350,24 +323,6 @@ describe(PLUGIN_CONTRACT_NAME, function () {
     it('People: must record voter address', async () => {
       const voter = Alice;
 
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-
-      await proposalTx.wait();
-
       const voteOption: VoteOption = VoteOption.Yes;
 
       const voteCommittee = PeoplesHouseCommittee;
@@ -388,6 +343,7 @@ describe(PLUGIN_CONTRACT_NAME, function () {
     });
   });
   describe('MasterNode: vote()', async () => {
+    let proposalId: BigNumber;
     beforeEach(async () => {
       daofinPlugin = await deployWithProxy<DaofinPlugin>(DaofinPlugin);
 
@@ -435,8 +391,9 @@ describe(PLUGIN_CONTRACT_NAME, function () {
             parseEther('1')
           ),
         ],
-        [Math.floor(Date.now() / 1000)],
+        [Math.floor(new Date().getTime() / 1000) + 10],
         [Bob.address],
+        '0',
       ];
       (await daofinPlugin.initialize(...initializeParams)).wait();
 
@@ -448,9 +405,6 @@ describe(PLUGIN_CONTRACT_NAME, function () {
       //   await daofinPlugin
       //     .connect(Beny)
       //     .updateOrJoinMasterNodeDelegatee(Tony.address);
-    });
-    it('MasterNode: must record in tally details', async () => {
-      const voter = John;
       createPropsalParams = createProposalParams(
         '0x00',
         [],
@@ -459,7 +413,8 @@ describe(PLUGIN_CONTRACT_NAME, function () {
         '0',
         '0'
       );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
+
+      proposalId = await daofinPlugin.callStatic.createProposal(
         ...createPropsalParams
       );
 
@@ -468,6 +423,10 @@ describe(PLUGIN_CONTRACT_NAME, function () {
         .createProposal(...createPropsalParams);
 
       await proposalTx.wait();
+      await new Promise(res => setTimeout(d => res(d), 12000));
+    });
+    it('MasterNode: must record in tally details', async () => {
+      const voter = John;
 
       const voteOption: VoteOption = VoteOption.Yes;
       const voteCommittee = MasterNodeCommittee;
@@ -490,24 +449,6 @@ describe(PLUGIN_CONTRACT_NAME, function () {
     it('MasterNode: must record voter address', async () => {
       const voter = John;
 
-      createPropsalParams = createProposalParams(
-        '0x00',
-        [],
-        '1',
-        '0',
-        '0',
-        '0'
-      );
-      const proposalId = await daofinPlugin.callStatic.createProposal(
-        ...createPropsalParams
-      );
-
-      const proposalTx = await daofinPlugin
-        .connect(Proposer)
-        .createProposal(...createPropsalParams);
-
-      await proposalTx.wait();
-
       const voteOption: VoteOption = VoteOption.Yes;
 
       const voteTx = await daofinPlugin
diff --git a/packages/js-client/package.json b/packages/js-client/package.json
index 0160132..03529a8 100644
--- a/packages/js-client/package.json
+++ b/packages/js-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@xinfin/osx-daofin-sdk-client",
   "author": "Aragon Association",
-  "version": "1.0.82",
+  "version": "1.0.86",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/osx-daofin-sdk-client.esm.js",
@@ -73,8 +73,8 @@
     "@ethersproject/wallet": "^5.7.0",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/keccak256": "^5.7.0",
-    "@xinfin/osx-daofin-contracts": "0.10.4",
-    "@xinfin/osx-daofin-contracts-ethers": "^0.10.6",
+    "@xinfin/osx-daofin-contracts": "0.10.7",
+    "@xinfin/osx-daofin-contracts-ethers": "^0.10.7",
     "@xinfin/osx-sdk-client": "^1.10.1",
     "graphql": "^16.6.0",
     "graphql-request": "4.3.0"
diff --git a/packages/js-client/src/internal/client/estimation.ts b/packages/js-client/src/internal/client/estimation.ts
index 394d566..702d534 100644
--- a/packages/js-client/src/internal/client/estimation.ts
+++ b/packages/js-client/src/internal/client/estimation.ts
@@ -35,6 +35,7 @@ export class DaofinClientEstimation
       proposalType,
       voteOption,
     }) => {
+      const costs = await this.getProposalCosts();
       const estimation =
         await this.getDaofinInstance().estimateGas.createProposal(
           toUtf8Bytes(metdata),
@@ -42,7 +43,8 @@ export class DaofinClientEstimation
           electionIndex,
           proposalType,
           allowFailureMap,
-          voteOption
+          voteOption,
+          { value: costs }
         );
 
       return this.web3.getApproximateGasFee(estimation.toBigInt());
@@ -83,4 +85,20 @@ export class DaofinClientEstimation
 
     return this.web3.getApproximateGasFee(estimation.toBigInt());
   };
+  execute: (proposalId: string) => Promise<GasFeeEstimation> = async (
+    proposalId
+  ) => {
+    const estimation = await this.getDaofinInstance().estimateGas.execute(
+      proposalId
+    );
+
+    return this.web3.getApproximateGasFee(estimation.toBigInt());
+  };
+  async getProposalCosts(): Promise<BigNumberish> {
+    const daofin = DaofinPlugin__factory.connect(
+      this.pluginAddress,
+      this.web3.getProvider()
+    );
+    return await daofin.proposalCosts();
+  }
 }
diff --git a/packages/js-client/src/internal/client/methods.ts b/packages/js-client/src/internal/client/methods.ts
index 28939c3..a98cb92 100644
--- a/packages/js-client/src/internal/client/methods.ts
+++ b/packages/js-client/src/internal/client/methods.ts
@@ -90,14 +90,17 @@ export class DaofinClientMethods
       proposalType,
       voteOption,
     } = params;
-
+    const costs = await this.getProposalCosts();
     const tx = await this.getDaofinInstance().createProposal(
       toUtf8Bytes(params.metdata),
       actions,
       electionIndex,
       proposalType,
       allowFailureMap,
-      voteOption
+      voteOption,
+      {
+        value: costs,
+      }
     );
 
     yield {
@@ -445,4 +448,25 @@ export class DaofinClientMethods
     );
     return await daofin.isThresholdReached(proposalId);
   }
+  async isOpenProposal(proposalId: string): Promise<boolean> {
+    const daofin = DaofinPlugin__factory.connect(
+      this.pluginAddress,
+      this.web3.getProvider()
+    );
+    return (await daofin.getProposal(proposalId)).open;
+  }
+  async isExecutedProposal(proposalId: string): Promise<boolean> {
+    const daofin = DaofinPlugin__factory.connect(
+      this.pluginAddress,
+      this.web3.getProvider()
+    );
+    return (await daofin.getProposal(proposalId)).executed;
+  }
+  async getProposalCosts(): Promise<BigNumberish> {
+    const daofin = DaofinPlugin__factory.connect(
+      this.pluginAddress,
+      this.web3.getProvider()
+    );
+    return await daofin.proposalCosts();
+  }
 }
diff --git a/packages/js-client/src/internal/interfaces.ts b/packages/js-client/src/internal/interfaces.ts
index d0c97cd..b446bec 100644
--- a/packages/js-client/src/internal/interfaces.ts
+++ b/packages/js-client/src/internal/interfaces.ts
@@ -70,6 +70,9 @@ export interface IDaofinClientMethods {
   execute: (proposalId: string) => AsyncGenerator<ExecuteStepValues>;
   isMinParticipationReached: (proposalId: string) => Promise<boolean>;
   isThresholdReached: (proposalId: string) => Promise<boolean>;
+  getProposalCosts: () => Promise<BigNumberish>;
+  isOpenProposal(proposalId: string): Promise<boolean>;
+  isExecutedProposal(proposalId: string): Promise<boolean>;
 }
 export interface IDaofinClientEncoding {}
 export interface IDaofinClientDecoding {
diff --git a/packages/subgraph/manifest/data/apothem.json b/packages/subgraph/manifest/data/apothem.json
index 65a08e9..78a17cd 100644
--- a/packages/subgraph/manifest/data/apothem.json
+++ b/packages/subgraph/manifest/data/apothem.json
@@ -6,7 +6,14 @@
       {
         "name": "PluginSetupProcessor",
         "address": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
-        "startBlock": 58301000
+        "startBlock": 58801000
+      }
+    ],
+    "DAO": [
+      {
+        "name": "DAO",
+        "address": "0x308a1DC5020c4B5d992F5543a7236c465997fecB",
+        "startBlock": 58501000
       }
     ]
   }
diff --git a/packages/subgraph/manifest/subgraph.placeholder.yaml b/packages/subgraph/manifest/subgraph.placeholder.yaml
index 99be869..48f6033 100644
--- a/packages/subgraph/manifest/subgraph.placeholder.yaml
+++ b/packages/subgraph/manifest/subgraph.placeholder.yaml
@@ -47,6 +47,27 @@ dataSources:
 # templates
 templates:
   # Plugin (package)
+  - name: DaoTemplateV1_0_0
+    kind: ethereum/contract
+    network: {{network}}
+    source:
+      abi: DAO
+    mapping:
+      kind: ethereum/events
+      apiVersion: 0.0.6
+      language: wasm/assemblyscript
+      entities:
+        - Dao
+      abis:
+        - name: DAO
+          file: $PLUGIN_MODULE/artifacts/@xinfin/osx/core/dao/DAO.sol/DAO.json
+      eventHandlers:
+        - event: Deposited(indexed address,indexed address,uint256,string)
+          handler: handleDeposited
+
+      file: ./src/osx/DAO.ts
+        
+
   - name: DaofinPlugin
     kind: ethereum/contract
     network: {{network}}
@@ -76,5 +97,9 @@ templates:
           handler: handleProposalTypeCreated
         - event: ProposalIdToProposalTypeIdAttached(uint256,uint256)
           handler: handleProposalIdToProposalTypeIdAttached
+        - event: ProposalExecuted(indexed uint256)
+          handler: handleProposalExecuted
+        - event: ElectionPeriodUpdated(uint64,uint64)
+          handler: handleElectionPeriodUpdated
       file: ./src/plugin/plugin.ts
 
diff --git a/packages/subgraph/schema.graphql b/packages/subgraph/schema.graphql
index 6206409..a58f4f4 100644
--- a/packages/subgraph/schema.graphql
+++ b/packages/subgraph/schema.graphql
@@ -19,7 +19,7 @@ type Dao @entity {
   actions: [Action!]! @derivedFrom(field: "dao")
   proposals: [IProposal!]! @derivedFrom(field: "dao")
   plugins: [Plugin!]! @derivedFrom(field: "dao")
-  deposits: [PluginDeposit!]! @derivedFrom(field: "dao")
+  deposits: [DaoDeposit!]! @derivedFrom(field: "dao")
 }
 
 # Plugins
@@ -45,8 +45,6 @@ type Plugin implements PluginInstallation @entity {
   "OSX related data"
   id: ID! # psp installationId
   dao: Dao!
-
-  "Set plugin specific related data below:"
   creationBlockNumber: BigInt!
   createdAt: BigInt
   xdcValidator: Bytes
@@ -55,6 +53,8 @@ type Plugin implements PluginInstallation @entity {
   judiciaries: [PluginJudiciary!]! @derivedFrom(field: "plugin")
   masterNodeDelegatees: [PluginMasterNodeDelegatee!]!
     @derivedFrom(field: "plugin")
+
+  electionPeriods: [PluginElectionPeriods!]! @derivedFrom(field: "plugin")
 }
 
 type PluginMember @entity {
@@ -108,6 +108,7 @@ type PluginProposal implements IProposal @entity {
   executionBlockNumber: BigInt
   executionTxHash: Bytes
   creationTxHash: Bytes
+  executedBy: Bytes
   proposalType: PluginProposalType
   votes: [PluginProposalVote!]! @derivedFrom(field: "proposal")
 }
@@ -121,6 +122,15 @@ type PluginDeposit @entity(immutable: true) {
   txHash: Bytes
   depositDate: BigInt
 }
+type DaoDeposit @entity(immutable: true) {
+  id: ID! # dao + block number
+  sender: Bytes!
+  amount: BigInt!
+  snapshotBlock: BigInt!
+  dao: Dao!
+  txHash: Bytes
+  depositDate: BigInt
+}
 type PluginJudiciary @entity {
   id: ID! # pluginId + block number
   member: Bytes!
@@ -159,6 +169,7 @@ type PluginProposalVote @entity {
 }
 type PluginProposalType @entity {
   id: ID! # pluginProposalId
+  proposalTypeId: ID!
   plugin: Plugin!
   proposals: [PluginProposal!] @derivedFrom(field: "proposalType")
   txHash: Bytes
@@ -173,3 +184,10 @@ type CommitteeVotingSettings @entity {
   minVotingPower: BigInt!
   proposalType: PluginProposalType!
 }
+
+type PluginElectionPeriods @entity {
+  id: ID!
+  startDate: BigInt!
+  endDate: BigInt!
+  plugin: Plugin!
+}
diff --git a/packages/subgraph/src/osx/DAO.ts b/packages/subgraph/src/osx/DAO.ts
new file mode 100644
index 0000000..69c9a49
--- /dev/null
+++ b/packages/subgraph/src/osx/DAO.ts
@@ -0,0 +1,26 @@
+import {Dao, DaoDeposit, PluginDeposit} from '../../generated/schema';
+import {Deposited} from '../../generated/templates/DaoTemplateV1_0_0/DAO';
+import {dataSource} from '@graphprotocol/graph-ts';
+
+export function handleDeposited(event: Deposited): void {
+  let daoContractAddress = event.transaction.to;
+  if (!daoContractAddress) return;
+
+  let daoContract = Dao.load(daoContractAddress.toHexString());
+
+  if (!daoContract) return;
+
+  let daoDepositId = daoContractAddress.concat(event.transaction.hash);
+  let daoDeposit = DaoDeposit.load(daoDepositId.toHexString());
+  if (daoDeposit) return;
+
+  daoDeposit = new DaoDeposit(daoDepositId.toHexString());
+
+  daoDeposit.depositDate = event.block.timestamp;
+  daoDeposit.dao = daoContractAddress.toHexString();
+  daoDeposit.amount = event.params.amount;
+  daoDeposit.snapshotBlock = event.block.number;
+  daoDeposit.txHash = event.transaction.hash;
+  daoDeposit.sender = event.params.sender;
+  daoDeposit.save();
+}
diff --git a/packages/subgraph/src/plugin/plugin.ts b/packages/subgraph/src/plugin/plugin.ts
index 3211b01..36b546c 100644
--- a/packages/subgraph/src/plugin/plugin.ts
+++ b/packages/subgraph/src/plugin/plugin.ts
@@ -10,17 +10,20 @@ import {
   PluginProposalVote,
   PluginProposalType,
   CommitteeVotingSettings,
+  PluginElectionPeriods,
 } from '../../generated/schema';
 import {
   ProposalCreated,
   Deposited,
   DaofinPlugin,
   JudiciaryChanged,
-  UpdateOrJoinMasterNodeDelegateeCall,
   MasterNodeDelegateeUpdated,
   VoteReceived,
   ProposalTypeCreated,
   ProposalIdToProposalTypeIdAttached,
+  ProposalExecuted,
+  ElectionPeriodUpdated,
+  UpdateElectionPeriodCall,
 } from '../../generated/templates/DaofinPlugin/DaofinPlugin';
 import {
   getDepositId,
@@ -29,13 +32,7 @@ import {
   getPluginProposalVoteId,
   getProposalId,
 } from '../../utils/proposals';
-import {
-  Address,
-  BigInt,
-  ByteArray,
-  Bytes,
-  dataSource,
-} from '@graphprotocol/graph-ts';
+import {Address, BigInt, dataSource} from '@graphprotocol/graph-ts';
 
 export function handleProposalCreated(event: ProposalCreated): void {
   let context = dataSource.context();
@@ -243,16 +240,18 @@ export function handleProposalTypeCreated(event: ProposalTypeCreated): void {
   if (!plugin) return;
 
   let pluginProposalTypeId = event.params._proposalType.toHexString();
+  let subgraphId = pluginInstallationId.concat(pluginProposalTypeId);
 
-  let pluginProposalType = PluginProposalType.load(pluginProposalTypeId);
+  let pluginProposalType = PluginProposalType.load(subgraphId);
 
   if (pluginProposalType) return;
 
-  pluginProposalType = new PluginProposalType(pluginProposalTypeId);
+  pluginProposalType = new PluginProposalType(subgraphId);
 
   pluginProposalType.txHash = event.transaction.hash;
   pluginProposalType.creationDate = event.block.timestamp;
   pluginProposalType.plugin = plugin.id;
+  pluginProposalType.proposalTypeId = pluginProposalTypeId;
 
   pluginProposalType.save();
 
@@ -260,14 +259,13 @@ export function handleProposalTypeCreated(event: ProposalTypeCreated): void {
     let item = event.params._settings[i];
 
     let setting = new CommitteeVotingSettings(
-      pluginProposalTypeId.concat(item.name.toHexString())
+      subgraphId.concat(item.name.toHexString())
     );
-
     setting.name = item.name;
     setting.minParticipation = item.minParticipation;
     setting.minVotingPower = item.minVotingPower;
     setting.supportThreshold = item.supportThreshold;
-    setting.proposalType = pluginProposalTypeId;
+    setting.proposalType = subgraphId;
 
     setting.save();
   }
@@ -293,12 +291,71 @@ export function handleProposalIdToProposalTypeIdAttached(
 
   let proposalId = getProposalId(pluginAddress, event.params._proposalId);
 
-  let pluginProposalType = PluginProposalType.load(pluginProposalTypeId);
+  let pluginProposalType = PluginProposalType.load(
+    proposalId.concat(pluginProposalTypeId)
+  );
   if (!pluginProposalType) return;
 
   let entity = PluginProposal.load(proposalId);
   if (!entity) return;
 
-  entity.proposalType = pluginProposalTypeId;
+  entity.proposalType = proposalId.concat(pluginProposalTypeId);
   entity.save();
 }
+export function handleProposalExecuted(event: ProposalExecuted): void {
+  let context = dataSource.context();
+
+  let daoId = context.getString('daoAddress');
+  let pluginInstallationId = context.getString('pluginInstallationId');
+  let dao = Dao.load(daoId.toString());
+  if (!dao) return;
+
+  let plugin = Plugin.load(pluginInstallationId);
+  if (!plugin) return;
+
+  let pluginProposalId = event.params.proposalId;
+
+  let proposalId = getProposalId(event.address, pluginProposalId);
+
+  let pluginProposal = PluginProposal.load(proposalId);
+  if (!pluginProposal) return;
+
+  pluginProposal.executed = true;
+  pluginProposal.executionDate = event.block.timestamp;
+  pluginProposal.executionBlockNumber = event.block.number;
+  pluginProposal.executionTxHash = event.transaction.hash;
+  pluginProposal.executedBy = event.transaction.from;
+
+  pluginProposal.save();
+}
+
+export function handleElectionPeriodUpdated(
+  event: ElectionPeriodUpdated
+): void {
+  let context = dataSource.context();
+
+  let daoId = context.getString('daoAddress');
+  let pluginInstallationId = context.getString('pluginInstallationId');
+  let dao = Dao.load(daoId.toString());
+  if (!dao) return;
+
+  let plugin = Plugin.load(pluginInstallationId);
+  if (!plugin) return;
+
+  let startDate = event.params._start;
+  let endDate = event.params._end;
+  let pluginElectionPeriodId = pluginInstallationId
+    .concat(startDate.toString())
+    .concat(endDate.toString());
+
+  let electionSchema = PluginElectionPeriods.load(pluginElectionPeriodId);
+  if (electionSchema) return;
+
+  electionSchema = new PluginElectionPeriods(pluginElectionPeriodId);
+
+  electionSchema.startDate = startDate;
+  electionSchema.endDate = endDate;
+  electionSchema.plugin = plugin.id;
+
+  electionSchema.save();
+}
diff --git a/yarn.lock b/yarn.lock
index 99c368b..4510c8c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3542,20 +3542,6 @@
     graphql "^16.5.0"
     graphql-request "^4.3.0"
 
-"@xinfin/osx-daofin-contracts@0.10.4":
-  version "0.10.4"
-  resolved "https://registry.yarnpkg.com/@xinfin/osx-daofin-contracts/-/osx-daofin-contracts-0.10.4.tgz#9b6f6c143c60c81b3825263cdb989077009b6d99"
-  integrity sha512-eZWVwAT/POVBYocGX2IQI2f26IBxDGY8CcKWVFnqbxjYw/Ynq7szRIot0HOPlo2kdQjOUS0WF3IdLWkWVPiabg==
-  dependencies:
-    "@ensdomains/ens-contracts" "0.0.20"
-    "@openzeppelin/contracts" "^4.8.2"
-    "@openzeppelin/contracts-upgradeable" "^4.8.2"
-    "@openzeppelin/hardhat-upgrades" "^1.27.0"
-    "@uniswap/lib" "^4.0.1-alpha"
-    "@xinfin/osx" "1.3.0-rc0"
-    "@xinfin/osx-ethers" "^1.3.0-rc1"
-    "@xinfin/osx-sdk-client" "^1.10.1"
-
 "@xinfin/osx-ethers@1.3.0-rc1", "@xinfin/osx-ethers@^1.3.0-rc1":
   version "1.3.0-rc1"
   resolved "https://registry.yarnpkg.com/@xinfin/osx-ethers/-/osx-ethers-1.3.0-rc1.tgz#7143f9d4530aaa431ffb8b9de15df08f03a8e8ee"