diff --git a/agora-test/goldens/agora-golden.json b/agora-test/goldens/agora-golden.json
index 2239d9a..bdde1fb 100644
--- a/agora-test/goldens/agora-golden.json
+++ b/agora-test/goldens/agora-golden.json
@@ -35,14 +35,14 @@
             "version": "ScriptV2"
         },
         "agora:mutateGovernorValidator": {
-            "cborHex": "590bb3590bb001000032323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330403371290000008991919299982199b89480000044c8c8c94ccc118cdc4a40000022646464a66609266e2520000011323232533304c3371290000008991919299982799b89480000044c8c8c8c8c94ccc150cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660ec66e252000001132323253330793371290000008991919299983e19b89480000044c8c8c94ccc1fccdc4a40000022646464a6661040266e25200000113232325333085013371290000008991919191929998450099b89480000044c8c8c8c8c8c8c8c8c8c94ccc25004cdc3a400400426464a66612c02a660f866e1ccc234041d4dd5984e00984b80984d808009919b8148000005200213370e664466612a0244466a66613e02002244a002264446004006646446600200600461420200461420200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc26004c8cccccc248042700428404dd483c1bab309f01309e010012323232533309d013370e90000010a5014a2614802004613c020026ea8c28004c28404c28004008528984f808008998478083b9bab309e01309d01309f010011632309e01309d01001309e010013758613802002900109919191919299984d8099b873330980122253330a2010011002133003337000049001185180800a400000290020a99984d80992998410099842009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400ccc88c8c8c8cc28004c29c04014cc28004010cc28004c29c04008cc28004c29c04004cc28004c29c04c2980400427c04c29404004c29004004c28c04008dd6185100803191851809851008009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400c4cdc79843009919191929998500099b87480080084c888c00800cdd718530080089128009853808011850808009baa30a30130a4010013230a30130a40100130a20130a101001375c102026144026611e021200266446612602466e1ccc2540400cc8dd5985280985200985300800985200985180985280800a40040026eb81fc00454ccc26c04cc894ccc27404cdc3801240002a66613a0266e1c005200014a22a66613a0266e1c005200214a02a66613a0266e1c005200414a0294054ccc27404cdc3801240042a66613a0266e1c005200014a02a66613a0266e1c005200214a22a66613a0266e1c005200414a0294054ccc27404cdc3801240082a66613a0266e1c005200014a02a66613a0266e1c005200214a02a66613a0266e1c005200414a2294454ccc27404cdc3800a4000294054ccc27404cdc3800a4004294054ccc27404cdc3800a400829445289bad3308f0149123476f76656e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308901232002375a00266611e021200200400266e9520023309a013230a20130a3010013308f01090013322330930123370e6612a02006646eacc29404c29004c29804004c29004c28c04c294040052002001375c0fe002132026eacc2840400920041533309b0133083013758661080264614402613c02614602002661300244a666142020022c2a66613a026ae8cc288040044c28c0400458dd61850808019bab30a10130a00100233223232323309f0130a6010053309f010043309f0130a6010023309f0130a6010013309f0130a60130a50100109e0130a40100130a30100130a201002375861420261400200a646144026142020026eb0cc21004c8c28804c27804c28c04004c8c28804c28404c28c04004cc23c0424004cc88cc24c048cdc39984a80801991bab30a50130a40130a60100130a40130a30130a50100148008004dd703f8009bab30a10130a001002149858585858cc8c26004894ccc28404004426c044c94ccc27804c0100044cc27404004c00cc28c040084c00cc28c04008c28c040048c8c8ccc27404005282513232323253330a0013370e90010010a5014a2614e020046142020026ea8004c28804c28c04004c8c28804c28c04004c28404c28004c28804004dd618500080199184f80984f80984f80984d80800984f00800984e80984e80800984f00984e8083a9bac07816309c01309b01073309a0100116309b010023095010013754612e02612c020dea666128020022930b184a0081b2999849008008a4c2c6124020066eb4004c24404004c23c0400c58dd680098470080098460080b2999845008008a4c2c6114020062c6eb4004c22404004c21c0400c58dd68009843008009842008018b1bad00130830100130810100316375a00261000200260fc0062c6eb4004c1f4004c1ec00c58dd6800983d0009bac00130780013076003375a00260ea00260e6026a6660e20022930b18388019bad0013070001306e003375a00260da00260d60066eb4004c1a8004c1a000cdd6800983380098328019bad0013064001375800260c40026eb0004c180004c1780d94ccc17000452616305c003375a00260b600260b20062c6eb4004c160004c1580594ccc15000452616305400316375a00260a600260a20062c6eb4004c140004c13800c58dd6800982680098258018b1bad001304a001304800316375a002608e002608a0062c6eb4004c110004dd6000982100098200019bad001303f001303d013533303b001149858c0ec00cdd6800981d000981c0019bad00130370013035003375a002606800260640066eb4004c0c4004c0bc00cdd680098170009bac001302c001375800260540026eb0014c0a4008dd70021119980e0010008018a50223375e6e9c008dd38009118019980200100091980090008b1119801802198028010009119800919111801001980180089128009191919191919191919191919191919191919191919191919191919299981799b89480000044c8c8c94ccc0c8cdc4a40000022646464a66606a66e252000001132323253330383371290000008991919299981d99b89480000044c8c8c94ccc0f8cdc4a400000226464646464a66608666e25200000113232323232035533304b001149858c12c00cdd6800982500098240018b1bad001304700130450165333043001149858c10c00c58dd6800982100098200018b1bad001303f001303d00316375a002607800260740062c6eb4004c0e4004c0dc00c58dd6800981b000981a0018b1bad001303300137580026062002605e0066eb4004c0b8004c0b004d4ccc0a800452616302a003375a0026052002604e0066eb4004c098004c09000cdd6800981180098108019bad0013020001301e003375a002603a0026eb0004c06c004dd600091191919299980b99b8748000008401854ccc05ccdc3a40080042600e603a0022660106eb8c074004010c078008c060004dd500111280091118010019198010019ba90012223300e2253330170011225001153330133375e602c60320020082600a6032002260046030002002464446004006602c002446600240022c9211e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301100112250011533300d30023013001132223002003301300113300300230120010012233333300300d0123752004002466600e4466e00dd6980a801000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300d00112250011333003300f001222300200313002300e00122253330083375e00460060022446004006244a00244600644a6660180022006266008601c0026004601a00246460044660040040024600446600400400297ae05740ae688c014c0080048c010c01000555ceaab9f5744ae848c008dd5000aab9e1",
+            "cborHex": "590bd7590bd401000032323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330403371290000008991919299982199b89480000044c8c8c94ccc118cdc4a40000022646464a66609266e2520000011323232533304c3371290000008991919299982799b89480000044c8c8c8c8c94ccc150cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660ec66e252000001132323253330793371290000008991919299983e19b89480000044c8c8c94ccc1fccdc4a40000022646464a6661040266e25200000113232325333085013371290000008991919191929998450099b89480000044c8c8c8c8c8c8c8c8c8c94ccc25004cdc3a400400426464a66612c02a660f866e1ccc234041d4dd5984e00984b80984d808009919b8148000005200213370e664466612a0244466a66613e02002244a002264446004006646446600200600461420200461420200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc26004c8cccccc248042700428404dd483c1bab309f01309e010012323232533309d013370e90000010a5014a2614802004613c020026ea8c28004c28404c28004008528984f808008998478083b9bab309e01309d01309f010011632309e01309d01001309e010013758613802002900109919191919299984d8099b873330980122253330a2010011002133003337000049001185180800a400000290020a99984d80992998410099842009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400ccc88c8c8c8cc28004c29c04014cc28004010cc28004c29c04008cc28004c29c04004cc28004c29c04c2980400427c04c29404004c29004004c28c04008dd6185100803191851809851008009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400c4cdc79843009919191929998500099b87480080084c888c00800cdd718530080089128009853808011850808009baa30a30130a4010013230a30130a40100130a20130a101001375c102026144026611e021200266446612602466e1ccc2540400cc8dd5985280985200985300800985200985180985280800a40040026eb81fc00454ccc26c04cc894ccc27404cdc3801240002a66613a0266e1c005200014a22a66613a0266e1c005200214a02a66613a0266e1c005200414a0294054ccc27404cdc3801240042a66613a0266e1c005200014a02a66613a0266e1c005200214a22a66613a0266e1c005200414a0294054ccc27404cdc3801240082a66613a0266e1c005200014a02a66613a0266e1c005200214a02a66613a0266e1c005200414a2294454ccc27404cdc3800a4000294054ccc27404cdc3800a4004294054ccc27404cdc3800a400829445289bad3308f0149124476f7665726e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308901232002375a00266611e021200200400266e9520023309a013230a20130a3010013308f01090013322330930123370e6612a02006646eacc29404c29004c29804004c29004c28c04c294040052002001375c0fe002132026eacc2840400920041533309b0133083013758661080264614402613c026146020026611e029201184e6f20676f7665726e6f72206f757470757420666f756e64003322330930123370e6612a020066eacc29004c28c04c294040052002001375c0fe6eb0c2840400cdd598508098500080119911919191984f809853008029984f808021984f809853008011984f809853008009984f8098530098528080084f009852008009851808009851008011bac30a10130a0010053230a20130a1010013758661080264614402613c02614602002646144026142026146020026611e021200266446612602466e1ccc2540400cc8dd5985280985200985300800985200985180985280800a40040026eb81fc004dd59850809850008010a4c2c2c2c2c66461300244a66614202002213602264a66613c02600800226613a020026006614602004260066146020046146020024646466613a02002941289919191929998500099b87480080085280a5130a70100230a1010013754002614402614602002646144026146020026142026140026144020026eb0c2800400cc8c27c04c27c04c27c04c26c04004c27804004c27404c27404004c27804c274041d4dd603c0b184e00984d80839984d008008b184d80801184a808009baa30970130960106f533309401001149858c250040d94ccc2480400452616309201003375a002612202002611e020062c6eb4004c23804004c230040594ccc2280400452616308a0100316375a002611202002610e020062c6eb4004c21804004c2100400c58dd68009841808009840808018b1bad001308001001307e00316375a00260fa00260f60062c6eb4004c1e8004dd6000983c000983b0019bad001307500130730135333071001149858c1c400cdd6800983800098370019bad001306d001306b003375a00260d400260d00066eb4004c19c004c19400cdd680098320009bac0013062001375800260c000260bc06ca6660b80022930b182e0019bad001305b001305900316375a00260b000260ac02ca6660a80022930b182a0018b1bad0013053001305100316375a00260a0002609c0062c6eb4004c134004c12c00c58dd6800982500098240018b1bad0013047001304500316375a00260880026eb0004c108004c10000cdd6800981f800981e809a99981d8008a4c2c60760066eb4004c0e8004c0e000cdd6800981b800981a8019bad00130340013032003375a0026062002605e0066eb4004c0b8004dd600098160009bac001302a001375800a60520046eb801088ccc07000800400c5281119baf374e0046e9c00488c00ccc0100080048cc00480045888cc00c010cc01400800488cc0048c888c00800cc00c00448940048c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c94ccc0bccdc4a40000022646464a66606466e252000001132323253330353371290000008991919299981c19b89480000044c8c8c94ccc0eccdc4a40000022646464a66607c66e2520000011323232323253330433371290000008991919191901aa9998258008a4c2c60960066eb4004c128004c12000c58dd68009823800982280b29998218008a4c2c60860062c6eb4004c108004c10000c58dd6800981f800981e8018b1bad001303c001303a00316375a0026072002606e0062c6eb4004c0d8004c0d000c58dd680098198009bac0013031001302f003375a002605c0026058026a6660540022930b18150019bad00130290013027003375a002604c00260480066eb4004c08c004c08400cdd68009810000980f0019bad001301d001375800260360026eb000488c8c8c94ccc05ccdc3a4000004200c2a66602e66e1d200400213007301d001133008375c603a002008603c00460300026ea8008894004888c00800c8cc00800cdd48009111980711299980b80089128008a99980999baf30163019001004130053019001130023018001001232223002003301600122330012001164911e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301100112250011533300d30023013001132223002003301300113300300230120010012233333300300d0123752004002466600e4466e00dd6980a801000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300d00112250011333003300f001222300200313002300e00122253330083375e00460060022446004006244a00244600644a6660180022006266008601c0026004601a00246460044660040040024600446600400400297ae05740ae688c014c0080048c010c01000555ceaab9f5744ae848c008dd5000aab9e1",
             "description": "agora:mutateGovernorValidator",
             "params": [
                 "Ply.Core.Types:AsData#PlutusLedgerApi.V1.Scripts:ScriptHash",
                 "Ply.Core.Types:AsData#Data.Tagged:Tagged#GHC.TypeLits:\"GovernorSTTag\"#PlutusLedgerApi.V1.Value:CurrencySymbol",
                 "Ply.Core.Types:AsData#Data.Tagged:Tagged#GHC.TypeLits:\"AuthorityTokenTag\"#PlutusLedgerApi.V1.Value:CurrencySymbol"
             ],
-            "rawHex": "590bb001000032323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330403371290000008991919299982199b89480000044c8c8c94ccc118cdc4a40000022646464a66609266e2520000011323232533304c3371290000008991919299982799b89480000044c8c8c8c8c94ccc150cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660ec66e252000001132323253330793371290000008991919299983e19b89480000044c8c8c94ccc1fccdc4a40000022646464a6661040266e25200000113232325333085013371290000008991919191929998450099b89480000044c8c8c8c8c8c8c8c8c8c94ccc25004cdc3a400400426464a66612c02a660f866e1ccc234041d4dd5984e00984b80984d808009919b8148000005200213370e664466612a0244466a66613e02002244a002264446004006646446600200600461420200461420200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc26004c8cccccc248042700428404dd483c1bab309f01309e010012323232533309d013370e90000010a5014a2614802004613c020026ea8c28004c28404c28004008528984f808008998478083b9bab309e01309d01309f010011632309e01309d01001309e010013758613802002900109919191919299984d8099b873330980122253330a2010011002133003337000049001185180800a400000290020a99984d80992998410099842009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400ccc88c8c8c8cc28004c29c04014cc28004010cc28004c29c04008cc28004c29c04004cc28004c29c04c2980400427c04c29404004c29004004c28c04008dd6185100803191851809851008009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400c4cdc79843009919191929998500099b87480080084c888c00800cdd718530080089128009853808011850808009baa30a30130a4010013230a30130a40100130a20130a101001375c102026144026611e021200266446612602466e1ccc2540400cc8dd5985280985200985300800985200985180985280800a40040026eb81fc00454ccc26c04cc894ccc27404cdc3801240002a66613a0266e1c005200014a22a66613a0266e1c005200214a02a66613a0266e1c005200414a0294054ccc27404cdc3801240042a66613a0266e1c005200014a02a66613a0266e1c005200214a22a66613a0266e1c005200414a0294054ccc27404cdc3801240082a66613a0266e1c005200014a02a66613a0266e1c005200214a02a66613a0266e1c005200414a2294454ccc27404cdc3800a4000294054ccc27404cdc3800a4004294054ccc27404cdc3800a400829445289bad3308f0149123476f76656e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308901232002375a00266611e021200200400266e9520023309a013230a20130a3010013308f01090013322330930123370e6612a02006646eacc29404c29004c29804004c29004c28c04c294040052002001375c0fe002132026eacc2840400920041533309b0133083013758661080264614402613c02614602002661300244a666142020022c2a66613a026ae8cc288040044c28c0400458dd61850808019bab30a10130a00100233223232323309f0130a6010053309f010043309f0130a6010023309f0130a6010013309f0130a60130a50100109e0130a40100130a30100130a201002375861420261400200a646144026142020026eb0cc21004c8c28804c27804c28c04004c8c28804c28404c28c04004cc23c0424004cc88cc24c048cdc39984a80801991bab30a50130a40130a60100130a40130a30130a50100148008004dd703f8009bab30a10130a001002149858585858cc8c26004894ccc28404004426c044c94ccc27804c0100044cc27404004c00cc28c040084c00cc28c04008c28c040048c8c8ccc27404005282513232323253330a0013370e90010010a5014a2614e020046142020026ea8004c28804c28c04004c8c28804c28c04004c28404c28004c28804004dd618500080199184f80984f80984f80984d80800984f00800984e80984e80800984f00984e8083a9bac07816309c01309b01073309a0100116309b010023095010013754612e02612c020dea666128020022930b184a0081b2999849008008a4c2c6124020066eb4004c24404004c23c0400c58dd680098470080098460080b2999845008008a4c2c6114020062c6eb4004c22404004c21c0400c58dd68009843008009842008018b1bad00130830100130810100316375a00261000200260fc0062c6eb4004c1f4004c1ec00c58dd6800983d0009bac00130780013076003375a00260ea00260e6026a6660e20022930b18388019bad0013070001306e003375a00260da00260d60066eb4004c1a8004c1a000cdd6800983380098328019bad0013064001375800260c40026eb0004c180004c1780d94ccc17000452616305c003375a00260b600260b20062c6eb4004c160004c1580594ccc15000452616305400316375a00260a600260a20062c6eb4004c140004c13800c58dd6800982680098258018b1bad001304a001304800316375a002608e002608a0062c6eb4004c110004dd6000982100098200019bad001303f001303d013533303b001149858c0ec00cdd6800981d000981c0019bad00130370013035003375a002606800260640066eb4004c0c4004c0bc00cdd680098170009bac001302c001375800260540026eb0014c0a4008dd70021119980e0010008018a50223375e6e9c008dd38009118019980200100091980090008b1119801802198028010009119800919111801001980180089128009191919191919191919191919191919191919191919191919191919299981799b89480000044c8c8c94ccc0c8cdc4a40000022646464a66606a66e252000001132323253330383371290000008991919299981d99b89480000044c8c8c94ccc0f8cdc4a400000226464646464a66608666e25200000113232323232035533304b001149858c12c00cdd6800982500098240018b1bad001304700130450165333043001149858c10c00c58dd6800982100098200018b1bad001303f001303d00316375a002607800260740062c6eb4004c0e4004c0dc00c58dd6800981b000981a0018b1bad001303300137580026062002605e0066eb4004c0b8004c0b004d4ccc0a800452616302a003375a0026052002604e0066eb4004c098004c09000cdd6800981180098108019bad0013020001301e003375a002603a0026eb0004c06c004dd600091191919299980b99b8748000008401854ccc05ccdc3a40080042600e603a0022660106eb8c074004010c078008c060004dd500111280091118010019198010019ba90012223300e2253330170011225001153330133375e602c60320020082600a6032002260046030002002464446004006602c002446600240022c9211e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301100112250011533300d30023013001132223002003301300113300300230120010012233333300300d0123752004002466600e4466e00dd6980a801000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300d00112250011333003300f001222300200313002300e00122253330083375e00460060022446004006244a00244600644a6660180022006266008601c0026004601a00246460044660040040024600446600400400297ae05740ae688c014c0080048c010c01000555ceaab9f5744ae848c008dd5000aab9e1",
+            "rawHex": "590bd401000032323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330403371290000008991919299982199b89480000044c8c8c94ccc118cdc4a40000022646464a66609266e2520000011323232533304c3371290000008991919299982799b89480000044c8c8c8c8c94ccc150cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660ec66e252000001132323253330793371290000008991919299983e19b89480000044c8c8c94ccc1fccdc4a40000022646464a6661040266e25200000113232325333085013371290000008991919191929998450099b89480000044c8c8c8c8c8c8c8c8c8c94ccc25004cdc3a400400426464a66612c02a660f866e1ccc234041d4dd5984e00984b80984d808009919b8148000005200213370e664466612a0244466a66613e02002244a002264446004006646446600200600461420200461420200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc26004c8cccccc248042700428404dd483c1bab309f01309e010012323232533309d013370e90000010a5014a2614802004613c020026ea8c28004c28404c28004008528984f808008998478083b9bab309e01309d01309f010011632309e01309d01001309e010013758613802002900109919191919299984d8099b873330980122253330a2010011002133003337000049001185180800a400000290020a99984d80992998410099842009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400ccc88c8c8c8cc28004c29c04014cc28004010cc28004c29c04008cc28004c29c04004cc28004c29c04c2980400427c04c29404004c29004004c28c04008dd6185100803191851809851008009bac33085013230a301309f0130a4010013230a30130a20130a4010013309001091013322330940123370e6612c02006646eacc29804c29404c29c04004c29404c29004c298040052002001375c100020046eacc28804c2840400c4cdc79843009919191929998500099b87480080084c888c00800cdd718530080089128009853808011850808009baa30a30130a4010013230a30130a40100130a20130a101001375c102026144026611e021200266446612602466e1ccc2540400cc8dd5985280985200985300800985200985180985280800a40040026eb81fc00454ccc26c04cc894ccc27404cdc3801240002a66613a0266e1c005200014a22a66613a0266e1c005200214a02a66613a0266e1c005200414a0294054ccc27404cdc3801240042a66613a0266e1c005200014a02a66613a0266e1c005200214a22a66613a0266e1c005200414a0294054ccc27404cdc3801240082a66613a0266e1c005200014a02a66613a0266e1c005200214a02a66613a0266e1c005200414a2294454ccc27404cdc3800a4000294054ccc27404cdc3800a4004294054ccc27404cdc3800a400829445289bad3308f0149124476f7665726e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308901232002375a00266611e021200200400266e9520023309a013230a20130a3010013308f01090013322330930123370e6612a02006646eacc29404c29004c29804004c29004c28c04c294040052002001375c0fe002132026eacc2840400920041533309b0133083013758661080264614402613c026146020026611e029201184e6f20676f7665726e6f72206f757470757420666f756e64003322330930123370e6612a020066eacc29004c28c04c294040052002001375c0fe6eb0c2840400cdd598508098500080119911919191984f809853008029984f808021984f809853008011984f809853008009984f8098530098528080084f009852008009851808009851008011bac30a10130a0010053230a20130a1010013758661080264614402613c02614602002646144026142026146020026611e021200266446612602466e1ccc2540400cc8dd5985280985200985300800985200985180985280800a40040026eb81fc004dd59850809850008010a4c2c2c2c2c66461300244a66614202002213602264a66613c02600800226613a020026006614602004260066146020046146020024646466613a02002941289919191929998500099b87480080085280a5130a70100230a1010013754002614402614602002646144026146020026142026140026144020026eb0c2800400cc8c27c04c27c04c27c04c26c04004c27804004c27404c27404004c27804c274041d4dd603c0b184e00984d80839984d008008b184d80801184a808009baa30970130960106f533309401001149858c250040d94ccc2480400452616309201003375a002612202002611e020062c6eb4004c23804004c230040594ccc2280400452616308a0100316375a002611202002610e020062c6eb4004c21804004c2100400c58dd68009841808009840808018b1bad001308001001307e00316375a00260fa00260f60062c6eb4004c1e8004dd6000983c000983b0019bad001307500130730135333071001149858c1c400cdd6800983800098370019bad001306d001306b003375a00260d400260d00066eb4004c19c004c19400cdd680098320009bac0013062001375800260c000260bc06ca6660b80022930b182e0019bad001305b001305900316375a00260b000260ac02ca6660a80022930b182a0018b1bad0013053001305100316375a00260a0002609c0062c6eb4004c134004c12c00c58dd6800982500098240018b1bad0013047001304500316375a00260880026eb0004c108004c10000cdd6800981f800981e809a99981d8008a4c2c60760066eb4004c0e8004c0e000cdd6800981b800981a8019bad00130340013032003375a0026062002605e0066eb4004c0b8004dd600098160009bac001302a001375800a60520046eb801088ccc07000800400c5281119baf374e0046e9c00488c00ccc0100080048cc00480045888cc00c010cc01400800488cc0048c888c00800cc00c00448940048c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c8c94ccc0bccdc4a40000022646464a66606466e252000001132323253330353371290000008991919299981c19b89480000044c8c8c94ccc0eccdc4a40000022646464a66607c66e2520000011323232323253330433371290000008991919191901aa9998258008a4c2c60960066eb4004c128004c12000c58dd68009823800982280b29998218008a4c2c60860062c6eb4004c108004c10000c58dd6800981f800981e8018b1bad001303c001303a00316375a0026072002606e0062c6eb4004c0d8004c0d000c58dd680098198009bac0013031001302f003375a002605c0026058026a6660540022930b18150019bad00130290013027003375a002604c00260480066eb4004c08c004c08400cdd68009810000980f0019bad001301d001375800260360026eb000488c8c8c94ccc05ccdc3a4000004200c2a66602e66e1d200400213007301d001133008375c603a002008603c00460300026ea8008894004888c00800c8cc00800cdd48009111980711299980b80089128008a99980999baf30163019001004130053019001130023018001001232223002003301600122330012001164911e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301100112250011533300d30023013001132223002003301300113300300230120010012233333300300d0123752004002466600e4466e00dd6980a801000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300d00112250011333003300f001222300200313002300e00122253330083375e00460060022446004006244a00244600644a6660180022006266008601c0026004601a00246460044660040040024600446600400400297ae05740ae688c014c0080048c010c01000555ceaab9f5744ae848c008dd5000aab9e1",
             "role": "ValidatorRole",
             "version": "ScriptV2"
         },
diff --git a/agora-test/goldens/agoraDebug-golden.json b/agora-test/goldens/agoraDebug-golden.json
index 9a5ae57..2d9bb19 100644
--- a/agora-test/goldens/agoraDebug-golden.json
+++ b/agora-test/goldens/agoraDebug-golden.json
@@ -35,14 +35,14 @@
             "version": "ScriptV2"
         },
         "agora:mutateGovernorValidator": {
-            "cborHex": "591077591074010000323232323232323232323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330453371290000008991919299982419b89480000044c8c8c94ccc12ccdc4a40000022646464a66609c66e252000001132323253330513371290000008991919299982a19b89480000044c8c8c8c8c94ccc164cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660f666e2520000011323232533307e337129000000899191929998408099b89480000044c8c8c94ccc21004cdc4a40000022646464a66610e0266e2520000011323232533308a013371290000008991919191929998478099b89480000044c8c8c8c8c8c8c8c8c8c94ccc26404cdc3a400400426464a66613602a660f864a666138020022002266144029213373696e676c65417574686f72697479546f6b656e4275726e65643a204d757374206275726e2065786163746c79203120474154000013370e66124020ea6eacc29004c27004c28c04004c8cdc0a40000029001099299984e00800880089985100a481254f6e6c79206f6e6520474154206d7573742065786973742061742074686520696e70757473000013370e66446661340244466a66614a02002244a002264446004006646446600200600461520200461520200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc27404c8cccccc25c04284042a404dd483c1bab30a70130a601001232323253330a2013370e9000001099299985180800880089985480a4937617574686f72697479546f6b656e7356616c6964496e3a2047415420696e636f72726563746c79206c69766573206174205075624b6579000014a02944c2b004008c28c04004dd51854009854809854008010a5130a701001133094010773756614c02614a02614e020022a66146029201355768696c6520636f756e74696e67204741547320617420696e707574733a20616c6c2047415473206d7573742062652076616c696400163230a60130a50100130a601001375861480200290010991919191929998500099b8733309d0122253330a8010011002133003337000049001185580800a400000290020a99985000992998410099299985100800880089985400a4812943616e206f6e6c79206d6f64696679207468652070696e6e656420676f7665726e6f7220646174756d0000133084015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801999119191919852809857808029985280802198528098578080119852809857808009985280985780985700800852009856808009856008009855808011bac30aa010063230ab0130aa010015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801899299985100800880089985400a4916476f7665726e6f722076616c696461746f722072756e000013371e610e0264646464a66614a0266e1d2002002132223002003375c615c02002244a002615e02004614c020026ea8c2ac04c2b004004c8c2ac04c2b004004c2a804c2a404004dd7040809855009984a0084a8099911984c00919b873309a01003323756615a02615802615c02002615802615602615a0200290010009bae07f001153330a001332253330a2013370e00490000a9998510099b87001480005288a9998510099b87001480085280a9998510099b87001480105280a50153330a2013370e00490010a9998510099b87001480005280a9998510099b87001480085288a9998510099b87001480105280a50153330a2013370e00490020a9998510099b87001480005280a9998510099b87001480085280a9998510099b87001480105288a51153330a2013370e00290000a50153330a2013370e00290010a50153330a2013370e00290020a5114a26eb4cc25005240123476f76656e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308b01232002375a002666124021260200400266e9520023309f013230aa0130ab010013309401095013322330980123370e6613402006646eacc2b404c2b004c2b804004c2b004c2ac04c2b4040052002001375c0fe00213c026eacc2a4040092004153330a00133083015330a6014911e5265736f6c766520676f7665726e6f72206f75746f70757420646174756d00137586610a0264615402614602615602002a6614c029211f4f6e6c7920676f7665726e6f72206f757470757420697320616c6c6f7765640013309d012253330a70100115330a8014910a456d707479206c6973740016153330a2013574661540200226156020022a6615002921154d6f7265207468616e206f6e6520656c656d656e74001637586152020066eacc2a404c2a004008cc88c8c8c8cc29004c2b804014cc29004010cc29004c2b804008cc29004c2b804004cc29004c2b804c2b40400428c04c2b004004c2ac04004c2a804008dd618548098540080299185500985480800a99853008420089bac33085013230aa0130a30130ab010013230aa0130a90130ab010013309401095013322330980123370e6613402006646eacc2b404c2b004c2b804004c2b004c2ac04c2b4040052002001375c0fe0026eacc2a404c2a00400852615330a6014911a4e657720676f7665726e6f7220646174756d20636f7272656374001615330a6014912b5370656e6420676f7665726e6f7220776974682072656465656d6572204d7574617465476f7665726e6f72001615330a6014911e476f7665726e6f7220696e7075742073686f756c642062652076616c6964001615330a601491304f6e6c792073656c6620616e6420676f7665726e6f722073637269707420696e707574732061726520616c6c6f7765640016332309d012253330a70100110a00113253330a30130040011330a201001300330ab010021300330ab0100230ab01001232323330a2010014a0944c8c8c8c94ccc29404cdc3a400400429405289857808011853008009baa00130aa0130ab010013230aa0130ab0100130a90130a80130aa01001375861500200664614e02614e02614e02614002002614c02002614a02614a02002614c02614a020ea6eb01e054cc28405240128412073696e676c6520617574686f7269747920746f6b656e20686173206265656e206275726e6564001630a40130a30107330a201001153309f01491445061747465726e206d61746368206661696c75726520696e2027646f2720626c6f636b2061742061676f72612f41676f72612f4566666563742e68733a36333a352d3232001630a301002309a010013754613e02613c020dea666134020022930a9984d8084e008b184e0081b299984c008008a4c2a6613202134022c6134020066eb4004c26404004c25c0400c54cc2540424c0458dd6800984b00800984a0080b2999848008008a4c2a6612202124022c6124020062a661200211c022c6eb4004c24404004c23c0400c54cc2340422c0458dd68009847008009846008018a9984500844008b1bad001308b010013089010031533087010850116375a002611002002610c020062a6610802104022c6eb4004c21404004c20c0400c54cc204041fc58dd68009841008009bac001308001001307e003375a00260fa00260f6026a6660ee0022930a9983c03c8b183c8019bad00130780013076003375a00260ea00260e60066eb4004c1c8004c1c000cdd6800983780098368019bad001306c001375800260d40026eb0004c1a0004c1980d94ccc1880045261533063064163064003375a00260c600260c20062a660be0ba2c6eb4004c180004c1780594ccc168004526153305b05c16305c003153305a05816375a00260b600260b20062a660ae0aa2c6eb4004c160004c15800c54cc15014858dd6800982a80098298018a998288278b1bad00130520013050003153304e04c16375a002609e002609a0062a660960922c6eb4004c130004dd6000982500098240019bad001304700130450135333041001149854cc10810c58c10c00cdd6800982100098200019bad001303f001303d003375a002607800260740066eb4004c0e4004c0dc00cdd6800981b0009bac0013034001375800260640026eb0014c0c4008dd7002111998108010008018a50223375e6e9c008dd3800a4811c5265736f6c766520676f7665726e6f7220696e70757420646174756d00223003330050020012330012001153302100216491197066726f6d4a7573743a20666f756e6420504e6f7468696e6700223300300433005002001223300123222300200330030011225001232323232323232323232323232323232323232323232323232323253330323371290000008991919299981a99b89480000044c8c8c94ccc0e0cdc4a40000022646464a66607666e2520000011323232533303e3371290000008991919299982099b89480000044c8c8c8c8c94ccc118cdc4a40000022646464646406aa66609e0022930a998280288b18288019bad0013050001304e003153304c04a16375a002609a002609602ca66608e0022930a998240248b18248018a998238228b1bad00130480013046003153304404216375a002608a00260860062a6608207e2c6eb4004c108004c10000c54cc0f80f058dd6800981f800981e8018a9981d81c8b1bad001303c001303a003153303803616375a00260720026eb0004c0dc004c0d400cdd6800981a0009819009a9998170008a4c2a6605e0602c60600066eb4004c0bc004c0b400cdd6800981600098150019bad00130290013027003375a002604c00260480066eb4004c08c004dd600098108009bac00122323232533301a3370e90000010a9981000308038a99980d19b874800800854cc0800204cc024dd7181180080209a99810006080698118009812001180d8009baa002491086e6f20646174756d0022500149010a646174756d20686173680023300200337520024446602044a666034002244a0022a66602a66ebcc060c0780040104c014c0780044c008c0740040048c888c00800cc06c00524010c696e6c696e6520646174756d002223002003223300120011533014002164911e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301200112250011533300d30023016001132223002003301600113300300230150010012233333300300d0153752004002466600e4466e00dd6980c001000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300e001122500113330033012001222300200313002301100122253330083375e00460060022446004006244a00244600644a66601a002200626600860220026004602000246460044660040040024600446600400400297ae05740ae688c020c0080048c01cc01c00555cea481257074727946726f6d28504f53495854696d65293a206d75737420626520706f736974697665005573eae71241317074727946726f6d2850446174615265636f72645b5d293a206c697374206973206c6f6e676572207468616e207a65726f005744ae848c008dd5000aab9e01",
+            "cborHex": "591045591042010000323232323232323232323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330453371290000008991919299982419b89480000044c8c8c94ccc12ccdc4a40000022646464a66609c66e252000001132323253330513371290000008991919299982a19b89480000044c8c8c8c8c94ccc164cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660f666e2520000011323232533307e337129000000899191929998408099b89480000044c8c8c94ccc21004cdc4a40000022646464a66610e0266e2520000011323232533308a013371290000008991919191929998478099b89480000044c8c8c8c8c8c8c8c8c8c94ccc26404cdc3a400400426464a66613602a660f864a666138020022002266144029213373696e676c65417574686f72697479546f6b656e4275726e65643a204d757374206275726e2065786163746c79203120474154000013370e66124020ea6eacc29004c27004c28c04004c8cdc0a40000029001099299984e00800880089985100a481254f6e6c79206f6e6520474154206d7573742065786973742061742074686520696e70757473000013370e66446661340244466a66614a02002244a002264446004006646446600200600461520200461520200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc27404c8cccccc25c04284042a404dd483c1bab30a70130a601001232323253330a2013370e9000001099299985180800880089985480a4937617574686f72697479546f6b656e7356616c6964496e3a2047415420696e636f72726563746c79206c69766573206174205075624b6579000014a02944c2b004008c28c04004dd51854009854809854008010a5130a701001133094010773756614c02614a02614e020022a66146029201355768696c6520636f756e74696e67204741547320617420696e707574733a20616c6c2047415473206d7573742062652076616c696400163230a60130a50100130a601001375861480200290010991919191929998500099b8733309d0122253330a8010011002133003337000049001185580800a400000290020a99985000992998410099299985100800880089985400a4812943616e206f6e6c79206d6f64696679207468652070696e6e656420676f7665726e6f7220646174756d0000133084015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801999119191919852809857808029985280802198528098578080119852809857808009985280985780985700800852009856808009856008009855808011bac30aa010063230ab0130aa010015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801899299985100800880089985400a4916476f7665726e6f722076616c696461746f722072756e000013371e610e0264646464a66614a0266e1d2002002132223002003375c615c02002244a002615e02004614c020026ea8c2ac04c2b004004c8c2ac04c2b004004c2a804c2a404004dd7040809855009984a0084a8099911984c00919b873309a01003323756615a02615802615c02002615802615602615a0200290010009bae07f001153330a001332253330a2013370e00490000a9998510099b87001480005288a9998510099b87001480085280a9998510099b87001480105280a50153330a2013370e00490010a9998510099b87001480005280a9998510099b87001480085288a9998510099b87001480105280a50153330a2013370e00490020a9998510099b87001480005280a9998510099b87001480085280a9998510099b87001480105288a51153330a2013370e00290000a50153330a2013370e00290010a50153330a2013370e00290020a5114a26eb4cc25005240124476f7665726e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308b01232002375a002666124021260200400266e9520023309f013230aa0130ab010013309401095013322330980123370e6613402006646eacc2b404c2b004c2b804004c2b004c2ac04c2b4040052002001375c0fe00213c026eacc2a4040092004153330a00133083015330a6014911e5265736f6c766520676f7665726e6f72206f75746f70757420646174756d00137586610a026461540261460261560200266128029201184e6f20676f7665726e6f72206f757470757420666f756e64003322330980123370e66134020066eacc2b004c2ac04c2b4040052002001375c0fe6eb0c2a40400cdd5985480985400801199119191919852009857008029985200802198520098570080119852009857008009985200985700985680800851809856008009855808009855008011bac30a90130a8010053230aa0130a9010015330a60108401137586610a026461540261460261560200264615402615202615602002661280212a0266446613002466e1ccc2680400cc8dd5985680985600985700800985600985580985680800a40040026eb81fc004dd59854809854008010a4c2a6614c029211a4e657720676f7665726e6f7220646174756d20636f7272656374001615330a6014912b5370656e6420676f7665726e6f7220776974682072656465656d6572204d7574617465476f7665726e6f72001615330a6014911e476f7665726e6f7220696e7075742073686f756c642062652076616c6964001615330a601491304f6e6c792073656c6620616e6420676f7665726e6f722073637269707420696e707574732061726520616c6c6f7765640016332309d012253330a70100110a00113253330a30130040011330a201001300330ab010021300330ab0100230ab01001232323330a2010014a0944c8c8c8c94ccc29404cdc3a400400429405289857808011853008009baa00130aa0130ab010013230aa0130ab0100130a90130a80130aa01001375861500200664614e02614e02614e02614002002614c02002614a02614a02002614c02614a020ea6eb01e054cc28405240128412073696e676c6520617574686f7269747920746f6b656e20686173206265656e206275726e6564001630a40130a30107330a201001153309f01491445061747465726e206d61746368206661696c75726520696e2027646f2720626c6f636b2061742061676f72612f41676f72612f4566666563742e68733a36333a352d3232001630a301002309a010013754613e02613c020dea666134020022930a9984d8084e008b184e0081b299984c008008a4c2a6613202134022c6134020066eb4004c26404004c25c0400c54cc2540424c0458dd6800984b00800984a0080b2999848008008a4c2a6612202124022c6124020062a661200211c022c6eb4004c24404004c23c0400c54cc2340422c0458dd68009847008009846008018a9984500844008b1bad001308b010013089010031533087010850116375a002611002002610c020062a6610802104022c6eb4004c21404004c20c0400c54cc204041fc58dd68009841008009bac001308001001307e003375a00260fa00260f6026a6660ee0022930a9983c03c8b183c8019bad00130780013076003375a00260ea00260e60066eb4004c1c8004c1c000cdd6800983780098368019bad001306c001375800260d40026eb0004c1a0004c1980d94ccc1880045261533063064163064003375a00260c600260c20062a660be0ba2c6eb4004c180004c1780594ccc168004526153305b05c16305c003153305a05816375a00260b600260b20062a660ae0aa2c6eb4004c160004c15800c54cc15014858dd6800982a80098298018a998288278b1bad00130520013050003153304e04c16375a002609e002609a0062a660960922c6eb4004c130004dd6000982500098240019bad001304700130450135333041001149854cc10810c58c10c00cdd6800982100098200019bad001303f001303d003375a002607800260740066eb4004c0e4004c0dc00cdd6800981b0009bac0013034001375800260640026eb0014c0c4008dd7002111998108010008018a50223375e6e9c008dd3800a4811c5265736f6c766520676f7665726e6f7220696e70757420646174756d00223003330050020012330012001153302100216491197066726f6d4a7573743a20666f756e6420504e6f7468696e6700223300300433005002001223300123222300200330030011225001232323232323232323232323232323232323232323232323232323253330323371290000008991919299981a99b89480000044c8c8c94ccc0e0cdc4a40000022646464a66607666e2520000011323232533303e3371290000008991919299982099b89480000044c8c8c8c8c94ccc118cdc4a40000022646464646406aa66609e0022930a998280288b18288019bad0013050001304e003153304c04a16375a002609a002609602ca66608e0022930a998240248b18248018a998238228b1bad00130480013046003153304404216375a002608a00260860062a6608207e2c6eb4004c108004c10000c54cc0f80f058dd6800981f800981e8018a9981d81c8b1bad001303c001303a003153303803616375a00260720026eb0004c0dc004c0d400cdd6800981a0009819009a9998170008a4c2a6605e0602c60600066eb4004c0bc004c0b400cdd6800981600098150019bad00130290013027003375a002604c00260480066eb4004c08c004dd600098108009bac00122323232533301a3370e90000010a9981000308038a99980d19b874800800854cc0800204cc024dd7181180080209a99810006080698118009812001180d8009baa002491086e6f20646174756d0022500149010a646174756d20686173680023300200337520024446602044a666034002244a0022a66602a66ebcc060c0780040104c014c0780044c008c0740040048c888c00800cc06c00524010c696e6c696e6520646174756d002223002003223300120011533014002164911e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301200112250011533300d30023016001132223002003301600113300300230150010012233333300300d0153752004002466600e4466e00dd6980c001000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300e001122500113330033012001222300200313002301100122253330083375e00460060022446004006244a00244600644a66601a002200626600860220026004602000246460044660040040024600446600400400297ae05740ae688c020c0080048c01cc01c00555cea481257074727946726f6d28504f53495854696d65293a206d75737420626520706f736974697665005573eae71241317074727946726f6d2850446174615265636f72645b5d293a206c697374206973206c6f6e676572207468616e207a65726f005744ae848c008dd5000aab9e01",
             "description": "agora:mutateGovernorValidator",
             "params": [
                 "Ply.Core.Types:AsData#PlutusLedgerApi.V1.Scripts:ScriptHash",
                 "Ply.Core.Types:AsData#Data.Tagged:Tagged#GHC.TypeLits:\"GovernorSTTag\"#PlutusLedgerApi.V1.Value:CurrencySymbol",
                 "Ply.Core.Types:AsData#Data.Tagged:Tagged#GHC.TypeLits:\"AuthorityTokenTag\"#PlutusLedgerApi.V1.Value:CurrencySymbol"
             ],
-            "rawHex": "591074010000323232323232323232323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330453371290000008991919299982419b89480000044c8c8c94ccc12ccdc4a40000022646464a66609c66e252000001132323253330513371290000008991919299982a19b89480000044c8c8c8c8c94ccc164cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660f666e2520000011323232533307e337129000000899191929998408099b89480000044c8c8c94ccc21004cdc4a40000022646464a66610e0266e2520000011323232533308a013371290000008991919191929998478099b89480000044c8c8c8c8c8c8c8c8c8c94ccc26404cdc3a400400426464a66613602a660f864a666138020022002266144029213373696e676c65417574686f72697479546f6b656e4275726e65643a204d757374206275726e2065786163746c79203120474154000013370e66124020ea6eacc29004c27004c28c04004c8cdc0a40000029001099299984e00800880089985100a481254f6e6c79206f6e6520474154206d7573742065786973742061742074686520696e70757473000013370e66446661340244466a66614a02002244a002264446004006646446600200600461520200461520200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc27404c8cccccc25c04284042a404dd483c1bab30a70130a601001232323253330a2013370e9000001099299985180800880089985480a4937617574686f72697479546f6b656e7356616c6964496e3a2047415420696e636f72726563746c79206c69766573206174205075624b6579000014a02944c2b004008c28c04004dd51854009854809854008010a5130a701001133094010773756614c02614a02614e020022a66146029201355768696c6520636f756e74696e67204741547320617420696e707574733a20616c6c2047415473206d7573742062652076616c696400163230a60130a50100130a601001375861480200290010991919191929998500099b8733309d0122253330a8010011002133003337000049001185580800a400000290020a99985000992998410099299985100800880089985400a4812943616e206f6e6c79206d6f64696679207468652070696e6e656420676f7665726e6f7220646174756d0000133084015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801999119191919852809857808029985280802198528098578080119852809857808009985280985780985700800852009856808009856008009855808011bac30aa010063230ab0130aa010015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801899299985100800880089985400a4916476f7665726e6f722076616c696461746f722072756e000013371e610e0264646464a66614a0266e1d2002002132223002003375c615c02002244a002615e02004614c020026ea8c2ac04c2b004004c8c2ac04c2b004004c2a804c2a404004dd7040809855009984a0084a8099911984c00919b873309a01003323756615a02615802615c02002615802615602615a0200290010009bae07f001153330a001332253330a2013370e00490000a9998510099b87001480005288a9998510099b87001480085280a9998510099b87001480105280a50153330a2013370e00490010a9998510099b87001480005280a9998510099b87001480085288a9998510099b87001480105280a50153330a2013370e00490020a9998510099b87001480005280a9998510099b87001480085280a9998510099b87001480105288a51153330a2013370e00290000a50153330a2013370e00290010a50153330a2013370e00290020a5114a26eb4cc25005240123476f76656e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308b01232002375a002666124021260200400266e9520023309f013230aa0130ab010013309401095013322330980123370e6613402006646eacc2b404c2b004c2b804004c2b004c2ac04c2b4040052002001375c0fe00213c026eacc2a4040092004153330a00133083015330a6014911e5265736f6c766520676f7665726e6f72206f75746f70757420646174756d00137586610a0264615402614602615602002a6614c029211f4f6e6c7920676f7665726e6f72206f757470757420697320616c6c6f7765640013309d012253330a70100115330a8014910a456d707479206c6973740016153330a2013574661540200226156020022a6615002921154d6f7265207468616e206f6e6520656c656d656e74001637586152020066eacc2a404c2a004008cc88c8c8c8cc29004c2b804014cc29004010cc29004c2b804008cc29004c2b804004cc29004c2b804c2b40400428c04c2b004004c2ac04004c2a804008dd618548098540080299185500985480800a99853008420089bac33085013230aa0130a30130ab010013230aa0130a90130ab010013309401095013322330980123370e6613402006646eacc2b404c2b004c2b804004c2b004c2ac04c2b4040052002001375c0fe0026eacc2a404c2a00400852615330a6014911a4e657720676f7665726e6f7220646174756d20636f7272656374001615330a6014912b5370656e6420676f7665726e6f7220776974682072656465656d6572204d7574617465476f7665726e6f72001615330a6014911e476f7665726e6f7220696e7075742073686f756c642062652076616c6964001615330a601491304f6e6c792073656c6620616e6420676f7665726e6f722073637269707420696e707574732061726520616c6c6f7765640016332309d012253330a70100110a00113253330a30130040011330a201001300330ab010021300330ab0100230ab01001232323330a2010014a0944c8c8c8c94ccc29404cdc3a400400429405289857808011853008009baa00130aa0130ab010013230aa0130ab0100130a90130a80130aa01001375861500200664614e02614e02614e02614002002614c02002614a02614a02002614c02614a020ea6eb01e054cc28405240128412073696e676c6520617574686f7269747920746f6b656e20686173206265656e206275726e6564001630a40130a30107330a201001153309f01491445061747465726e206d61746368206661696c75726520696e2027646f2720626c6f636b2061742061676f72612f41676f72612f4566666563742e68733a36333a352d3232001630a301002309a010013754613e02613c020dea666134020022930a9984d8084e008b184e0081b299984c008008a4c2a6613202134022c6134020066eb4004c26404004c25c0400c54cc2540424c0458dd6800984b00800984a0080b2999848008008a4c2a6612202124022c6124020062a661200211c022c6eb4004c24404004c23c0400c54cc2340422c0458dd68009847008009846008018a9984500844008b1bad001308b010013089010031533087010850116375a002611002002610c020062a6610802104022c6eb4004c21404004c20c0400c54cc204041fc58dd68009841008009bac001308001001307e003375a00260fa00260f6026a6660ee0022930a9983c03c8b183c8019bad00130780013076003375a00260ea00260e60066eb4004c1c8004c1c000cdd6800983780098368019bad001306c001375800260d40026eb0004c1a0004c1980d94ccc1880045261533063064163064003375a00260c600260c20062a660be0ba2c6eb4004c180004c1780594ccc168004526153305b05c16305c003153305a05816375a00260b600260b20062a660ae0aa2c6eb4004c160004c15800c54cc15014858dd6800982a80098298018a998288278b1bad00130520013050003153304e04c16375a002609e002609a0062a660960922c6eb4004c130004dd6000982500098240019bad001304700130450135333041001149854cc10810c58c10c00cdd6800982100098200019bad001303f001303d003375a002607800260740066eb4004c0e4004c0dc00cdd6800981b0009bac0013034001375800260640026eb0014c0c4008dd7002111998108010008018a50223375e6e9c008dd3800a4811c5265736f6c766520676f7665726e6f7220696e70757420646174756d00223003330050020012330012001153302100216491197066726f6d4a7573743a20666f756e6420504e6f7468696e6700223300300433005002001223300123222300200330030011225001232323232323232323232323232323232323232323232323232323253330323371290000008991919299981a99b89480000044c8c8c94ccc0e0cdc4a40000022646464a66607666e2520000011323232533303e3371290000008991919299982099b89480000044c8c8c8c8c94ccc118cdc4a40000022646464646406aa66609e0022930a998280288b18288019bad0013050001304e003153304c04a16375a002609a002609602ca66608e0022930a998240248b18248018a998238228b1bad00130480013046003153304404216375a002608a00260860062a6608207e2c6eb4004c108004c10000c54cc0f80f058dd6800981f800981e8018a9981d81c8b1bad001303c001303a003153303803616375a00260720026eb0004c0dc004c0d400cdd6800981a0009819009a9998170008a4c2a6605e0602c60600066eb4004c0bc004c0b400cdd6800981600098150019bad00130290013027003375a002604c00260480066eb4004c08c004dd600098108009bac00122323232533301a3370e90000010a9981000308038a99980d19b874800800854cc0800204cc024dd7181180080209a99810006080698118009812001180d8009baa002491086e6f20646174756d0022500149010a646174756d20686173680023300200337520024446602044a666034002244a0022a66602a66ebcc060c0780040104c014c0780044c008c0740040048c888c00800cc06c00524010c696e6c696e6520646174756d002223002003223300120011533014002164911e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301200112250011533300d30023016001132223002003301600113300300230150010012233333300300d0153752004002466600e4466e00dd6980c001000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300e001122500113330033012001222300200313002301100122253330083375e00460060022446004006244a00244600644a66601a002200626600860220026004602000246460044660040040024600446600400400297ae05740ae688c020c0080048c01cc01c00555cea481257074727946726f6d28504f53495854696d65293a206d75737420626520706f736974697665005573eae71241317074727946726f6d2850446174615265636f72645b5d293a206c697374206973206c6f6e676572207468616e207a65726f005744ae848c008dd5000aab9e01",
+            "rawHex": "591042010000323232323232323232323232323232323232323232323232323232323232323232323232323232323232322222223232323232323232323232323232323232323232323232323232323232323253330453371290000008991919299982419b89480000044c8c8c94ccc12ccdc4a40000022646464a66609c66e252000001132323253330513371290000008991919299982a19b89480000044c8c8c8c8c94ccc164cdc4a4000002264646464646464646464646464646464646464646464646464646464646464646464a6660f666e2520000011323232533307e337129000000899191929998408099b89480000044c8c8c94ccc21004cdc4a40000022646464a66610e0266e2520000011323232533308a013371290000008991919191929998478099b89480000044c8c8c8c8c8c8c8c8c8c94ccc26404cdc3a400400426464a66613602a660f864a666138020022002266144029213373696e676c65417574686f72697479546f6b656e4275726e65643a204d757374206275726e2065786163746c79203120474154000013370e66124020ea6eacc29004c27004c28c04004c8cdc0a40000029001099299984e00800880089985100a481254f6e6c79206f6e6520474154206d7573742065786973742061742074686520696e70757473000013370e66446661340244466a66614a02002244a002264446004006646446600200600461520200461520200246002446664e0088004c014008cc0180140044c920004988c00c0040048c94ccc27404c8cccccc25c04284042a404dd483c1bab30a70130a601001232323253330a2013370e9000001099299985180800880089985480a4937617574686f72697479546f6b656e7356616c6964496e3a2047415420696e636f72726563746c79206c69766573206174205075624b6579000014a02944c2b004008c28c04004dd51854009854809854008010a5130a701001133094010773756614c02614a02614e020022a66146029201355768696c6520636f756e74696e67204741547320617420696e707574733a20616c6c2047415473206d7573742062652076616c696400163230a60130a50100130a601001375861480200290010991919191929998500099b8733309d0122253330a8010011002133003337000049001185580800a400000290020a99985000992998410099299985100800880089985400a4812943616e206f6e6c79206d6f64696679207468652070696e6e656420676f7665726e6f7220646174756d0000133084015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801999119191919852809857808029985280802198528098578080119852809857808009985280985780985700800852009856808009856008009855808011bac30aa010063230ab0130aa010015330a70108501137586610c0264615602614802615802002646156026154026158020026612a0212c0266446613202466e1ccc26c0400cc8dd5985700985680985780800985680985600985700800a40040026eb820004008dd5985500985480801899299985100800880089985400a4916476f7665726e6f722076616c696461746f722072756e000013371e610e0264646464a66614a0266e1d2002002132223002003375c615c02002244a002615e02004614c020026ea8c2ac04c2b004004c8c2ac04c2b004004c2a804c2a404004dd7040809855009984a0084a8099911984c00919b873309a01003323756615a02615802615c02002615802615602615a0200290010009bae07f001153330a001332253330a2013370e00490000a9998510099b87001480005288a9998510099b87001480085280a9998510099b87001480105280a50153330a2013370e00490010a9998510099b87001480005280a9998510099b87001480085288a9998510099b87001480105280a50153330a2013370e00490020a9998510099b87001480005280a9998510099b87001480085280a9998510099b87001480105288a51153330a2013370e00290000a50153330a2013370e00290010a50153330a2013370e00290020a5114a26eb4cc25005240124476f7665726e6f722072656465656d65722073686f756c64206265207265736f6c7665640033223308b01232002375a002666124021260200400266e9520023309f013230aa0130ab010013309401095013322330980123370e6613402006646eacc2b404c2b004c2b804004c2b004c2ac04c2b4040052002001375c0fe00213c026eacc2a4040092004153330a00133083015330a6014911e5265736f6c766520676f7665726e6f72206f75746f70757420646174756d00137586610a026461540261460261560200266128029201184e6f20676f7665726e6f72206f757470757420666f756e64003322330980123370e66134020066eacc2b004c2ac04c2b4040052002001375c0fe6eb0c2a40400cdd5985480985400801199119191919852009857008029985200802198520098570080119852009857008009985200985700985680800851809856008009855808009855008011bac30a90130a8010053230aa0130a9010015330a60108401137586610a026461540261460261560200264615402615202615602002661280212a0266446613002466e1ccc2680400cc8dd5985680985600985700800985600985580985680800a40040026eb81fc004dd59854809854008010a4c2a6614c029211a4e657720676f7665726e6f7220646174756d20636f7272656374001615330a6014912b5370656e6420676f7665726e6f7220776974682072656465656d6572204d7574617465476f7665726e6f72001615330a6014911e476f7665726e6f7220696e7075742073686f756c642062652076616c6964001615330a601491304f6e6c792073656c6620616e6420676f7665726e6f722073637269707420696e707574732061726520616c6c6f7765640016332309d012253330a70100110a00113253330a30130040011330a201001300330ab010021300330ab0100230ab01001232323330a2010014a0944c8c8c8c94ccc29404cdc3a400400429405289857808011853008009baa00130aa0130ab010013230aa0130ab0100130a90130a80130aa01001375861500200664614e02614e02614e02614002002614c02002614a02614a02002614c02614a020ea6eb01e054cc28405240128412073696e676c6520617574686f7269747920746f6b656e20686173206265656e206275726e6564001630a40130a30107330a201001153309f01491445061747465726e206d61746368206661696c75726520696e2027646f2720626c6f636b2061742061676f72612f41676f72612f4566666563742e68733a36333a352d3232001630a301002309a010013754613e02613c020dea666134020022930a9984d8084e008b184e0081b299984c008008a4c2a6613202134022c6134020066eb4004c26404004c25c0400c54cc2540424c0458dd6800984b00800984a0080b2999848008008a4c2a6612202124022c6124020062a661200211c022c6eb4004c24404004c23c0400c54cc2340422c0458dd68009847008009846008018a9984500844008b1bad001308b010013089010031533087010850116375a002611002002610c020062a6610802104022c6eb4004c21404004c20c0400c54cc204041fc58dd68009841008009bac001308001001307e003375a00260fa00260f6026a6660ee0022930a9983c03c8b183c8019bad00130780013076003375a00260ea00260e60066eb4004c1c8004c1c000cdd6800983780098368019bad001306c001375800260d40026eb0004c1a0004c1980d94ccc1880045261533063064163064003375a00260c600260c20062a660be0ba2c6eb4004c180004c1780594ccc168004526153305b05c16305c003153305a05816375a00260b600260b20062a660ae0aa2c6eb4004c160004c15800c54cc15014858dd6800982a80098298018a998288278b1bad00130520013050003153304e04c16375a002609e002609a0062a660960922c6eb4004c130004dd6000982500098240019bad001304700130450135333041001149854cc10810c58c10c00cdd6800982100098200019bad001303f001303d003375a002607800260740066eb4004c0e4004c0dc00cdd6800981b0009bac0013034001375800260640026eb0014c0c4008dd7002111998108010008018a50223375e6e9c008dd3800a4811c5265736f6c766520676f7665726e6f7220696e70757420646174756d00223003330050020012330012001153302100216491197066726f6d4a7573743a20666f756e6420504e6f7468696e6700223300300433005002001223300123222300200330030011225001232323232323232323232323232323232323232323232323232323253330323371290000008991919299981a99b89480000044c8c8c94ccc0e0cdc4a40000022646464a66607666e2520000011323232533303e3371290000008991919299982099b89480000044c8c8c8c8c94ccc118cdc4a40000022646464646406aa66609e0022930a998280288b18288019bad0013050001304e003153304c04a16375a002609a002609602ca66608e0022930a998240248b18248018a998238228b1bad00130480013046003153304404216375a002608a00260860062a6608207e2c6eb4004c108004c10000c54cc0f80f058dd6800981f800981e8018a9981d81c8b1bad001303c001303a003153303803616375a00260720026eb0004c0dc004c0d400cdd6800981a0009819009a9998170008a4c2a6605e0602c60600066eb4004c0bc004c0b400cdd6800981600098150019bad00130290013027003375a002604c00260480066eb4004c08c004dd600098108009bac00122323232533301a3370e90000010a9981000308038a99980d19b874800800854cc0800204cc024dd7181180080209a99810006080698118009812001180d8009baa002491086e6f20646174756d0022500149010a646174756d20686173680023300200337520024446602044a666034002244a0022a66602a66ebcc060c0780040104c014c0780044c008c0740040048c888c00800cc06c00524010c696e6c696e6520646174756d002223002003223300120011533014002164911e476f7665726e6f72205554584f2073686f756c6420636172727920475354003007222533301200112250011533300d30023016001132223002003301600113300300230150010012233333300300d0153752004002466600e4466e00dd6980c001000a40006eac004520002222333300533006004002001232223002003300400112250012300422533300e001122500113330033012001222300200313002301100122253330083375e00460060022446004006244a00244600644a66601a002200626600860220026004602000246460044660040040024600446600400400297ae05740ae688c020c0080048c01cc01c00555cea481257074727946726f6d28504f53495854696d65293a206d75737420626520706f736974697665005573eae71241317074727946726f6d2850446174615265636f72645b5d293a206c697374206973206c6f6e676572207468616e207a65726f005744ae848c008dd5000aab9e01",
             "role": "ValidatorRole",
             "version": "ScriptV2"
         },
diff --git a/agora/Agora/Effect/GovernorMutation.hs b/agora/Agora/Effect/GovernorMutation.hs
index b52ae6b..4e4efc7 100644
--- a/agora/Agora/Effect/GovernorMutation.hs
+++ b/agora/Agora/Effect/GovernorMutation.hs
@@ -27,7 +27,7 @@ import Agora.Governor (
  )
 import Agora.Proposal (PProposalId)
 import Agora.SafeMoney (AuthorityTokenTag, GovernorSTTag)
-import Agora.Utils (pfindInputWithStateThreadToken, pfindOutputWithStateThreadTokenAndAddress)
+import Agora.Utils (pfindInputWithStateThreadToken, pfindOutputWithStateThreadToken)
 import Generics.SOP qualified as SOP
 import Plutarch.Api.V1 (PCurrencySymbol)
 import Plutarch.Api.V2 (
@@ -204,8 +204,6 @@ mutateGovernorValidator =
 
         governorRef = pfield @"outRef" # governorInput
 
-        governorInputAddress = pfield @"address" #$ pfield @"resolved" # governorInput
-
         governorInputDatum =
           ptrace "Resolve governor input datum" $
             pfromData $
@@ -256,9 +254,8 @@ mutateGovernorValidator =
         governorOutput =
           passertPJust
             # "No governor output found"
-            #$ pfindOutputWithStateThreadTokenAndAddress
+            #$ pfindOutputWithStateThreadToken
             # pfromData gstSymbol
-            # governorInputAddress
             # pfromData txInfoF.outputs
 
         governorOutputDatum =
diff --git a/agora/Agora/Utils.hs b/agora/Agora/Utils.hs
index 03aaefe..f41672e 100644
--- a/agora/Agora/Utils.hs
+++ b/agora/Agora/Utils.hs
@@ -21,7 +21,7 @@ module Agora.Utils (
   puncurryTuple,
   psubtractSortedValue,
   pfindInputWithStateThreadToken,
-  pfindOutputWithStateThreadTokenAndAddress,
+  pfindOutputWithStateThreadToken,
   pisSubValueOf,
 ) where
 
@@ -31,7 +31,6 @@ import Plutarch.Api.V1.AssocMap qualified as AssocMap
 import Plutarch.Api.V1.Scripts (PDatumHash (PDatumHash))
 import Plutarch.Api.V2 (
   AmountGuarantees (NoGuarantees),
-  PAddress,
   PCurrencySymbol,
   PMaybeData (PDNothing),
   PTuple,
@@ -203,19 +202,17 @@ pfindInputWithStateThreadToken = plam $ \tokenSymbol inputs ->
     # inputs
 
 {- | Find an output containing exactly one token with the given currency symbol,
-    and with a PAddress that matches the given one.
 
      @since 1.0.0
 -}
-pfindOutputWithStateThreadTokenAndAddress ::
+pfindOutputWithStateThreadToken ::
   forall tag.
   ClosedTerm
     ( PTagged tag PCurrencySymbol
-        :--> PAddress
         :--> PBuiltinList PTxOut
         :--> PMaybe PTxOut
     )
-pfindOutputWithStateThreadTokenAndAddress = plam $ \tokenSymbol address outputs ->
+pfindOutputWithStateThreadToken = plam $ \tokenSymbol outputs ->
   pfind
     # ( plam $ \output ->
           ( ptaggedSymbolValueOf
@@ -223,7 +220,6 @@ pfindOutputWithStateThreadTokenAndAddress = plam $ \tokenSymbol address outputs
               # (pfield @"value" # output)
               #== 1
           )
-            #&& (address #== (pfield @"address" # output))
       )
     # outputs