diff --git a/README.md b/README.md
index ef7b8621..88594316 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,6 @@ are human-browseable. The files contents are:
 - `templateId`: Template ID (must match `airnode`, `endpointId`, `parameters` encoded and hashed)
 - `decodedParameters`: `parameters` decoded to be human-readable
 - `chains`: Chains that the template is currently deployed on (must match ones from `chains.json`)
-- `templateName`: A human-readable name for the template, suitable for documentation use.
-- `description`: A human-readable description for the template, suitable for documentation use (optional).
 
 ### `/data/apis/{oisTitle}/beacons`
 
diff --git a/data/apis/Amberdata/beacons/aave_usd.json b/data/apis/Amberdata/beacons/aave_usd.json
index 196ecc1b..46d93a2f 100644
--- a/data/apis/Amberdata/beacons/aave_usd.json
+++ b/data/apis/Amberdata/beacons/aave_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x9c24111e2c324627cb837b5ec68e17e457596c9398683b280da533e27ab50894",
   "templateName": "AAVE/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000616176655f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "aave_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x7c3e9a38a16439e9b3e77bfe742f6c10004c26beabfab70fd78e3cf062ed6256",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/atom_usd.json b/data/apis/Amberdata/beacons/atom_usd.json
index 29eef06e..bdd11c29 100644
--- a/data/apis/Amberdata/beacons/atom_usd.json
+++ b/data/apis/Amberdata/beacons/atom_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xb05f57b84056d8bb075b5f1012a3e50a1039175bcfceaaddd6ee7fc774fca35e",
   "templateName": "ATOM/USD",
-  "parameters": "0x3162626262620000000000000000000000000000000000000000000000000000706169720000000000000000000000000000000000000000000000000000000061746f6d5f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "atom_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xb3fe6276a6b7258dbfe07dda5a3959538d56967531417b8a67f58f4918977584",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/avax_usd.json b/data/apis/Amberdata/beacons/avax_usd.json
index 3cd6294a..db09b974 100644
--- a/data/apis/Amberdata/beacons/avax_usd.json
+++ b/data/apis/Amberdata/beacons/avax_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x2a0219013e042c3d68afa6501e9798c84863e7e466f64f4a7d45cb00bf70732e",
   "templateName": "AVAX/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000617661785f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "avax_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xf1976a1d0ce6b6e3a534779baa4ae0a5b3c7a030bc4bd02f35b737b114a7d086",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/average gas on ethereum mainnet.json b/data/apis/Amberdata/beacons/average gas on ethereum mainnet.json
index cd8f660c..66731e72 100644
--- a/data/apis/Amberdata/beacons/average gas on ethereum mainnet.json	
+++ b/data/apis/Amberdata/beacons/average gas on ethereum mainnet.json	
@@ -1,19 +1,8 @@
 {
   "templateId": "0x2c552c0210bea2ab148355aaa285bddfe3c1b11f8eeb17c9e6bccc6ec56f9954",
   "templateName": "Average Gas on Ethereum Mainnet",
-  "parameters": "0x31626200000000000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e617665726167652e67617350726963652c000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d7000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.average.gasPrice,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x44407753c8ffd478e377af11067a1619dfe5bb810fd4d0265e601574f4fc0a06",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/bal_usd.json b/data/apis/Amberdata/beacons/bal_usd.json
index d60021a6..ecf78cf6 100644
--- a/data/apis/Amberdata/beacons/bal_usd.json
+++ b/data/apis/Amberdata/beacons/bal_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xf60503627e5c2cf3e44c4a39d574a472992823f160d629a6635807de1ec4dce2",
   "templateName": "BAL/USD",
-  "parameters": "0x3162626262620000000000000000000000000000000000000000000000000000706169720000000000000000000000000000000000000000000000000000000062616c5f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "bal_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xfec7084cc5e427c0832f15010a9af9e459fff9db5da0a359eed657cd14266893",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/bat_usd.json b/data/apis/Amberdata/beacons/bat_usd.json
index d88f0b0d..0bd079d7 100644
--- a/data/apis/Amberdata/beacons/bat_usd.json
+++ b/data/apis/Amberdata/beacons/bat_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x3f9aa8fb88335e7deb5ac57de6158e89b96fed949fca56f9fcfb1f6b65bfa08c",
   "templateName": "BAT/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006261745f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "bat_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xe3910b726a1ed7705062a28ee3526ebde051f398d9141e88ac8453cd15aa610a",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/btc_usd.json b/data/apis/Amberdata/beacons/btc_usd.json
index b5ee19bd..305919d6 100644
--- a/data/apis/Amberdata/beacons/btc_usd.json
+++ b/data/apis/Amberdata/beacons/btc_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x5159c2c6e3b9584eb673fa9054bdbf8e74d0b6a9abe3c237556b631203c72be6",
   "templateName": "BTC/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006274635f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "btc_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x49e889871813b16854fd7faecad16b5ba59d33a9669b47f927501136840c021b",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/comp_usd.json b/data/apis/Amberdata/beacons/comp_usd.json
index ace623fe..fddc923a 100644
--- a/data/apis/Amberdata/beacons/comp_usd.json
+++ b/data/apis/Amberdata/beacons/comp_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xda1146bcb4ac9a3f7451f5f52d29a2a1f607004b5214e9b859427b4cddd81689",
   "templateName": "COMP/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000636f6d705f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "comp_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x575b447eeeebc8612609081287f6d534e1629bdcc913c487116a0d89b4cea8f6",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/dai_usd.json b/data/apis/Amberdata/beacons/dai_usd.json
index 314d4947..7c04376a 100644
--- a/data/apis/Amberdata/beacons/dai_usd.json
+++ b/data/apis/Amberdata/beacons/dai_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x86012c43d9aceabd9a010ab3eb9b80e6ac371e4056b3f6500b35ef68b3da1dc2",
   "templateName": "DAI/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006461695f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "dai_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x72c512f825577f581e7100dba06031dc34c748e948bb060af51ba76112a9abc0",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/eth_btc.json b/data/apis/Amberdata/beacons/eth_btc.json
index 0a1df160..de9cf49b 100644
--- a/data/apis/Amberdata/beacons/eth_btc.json
+++ b/data/apis/Amberdata/beacons/eth_btc.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xc047a4eba9bcc27a196b987c43ba91853bf7e24b073a071138f423c8fe72d619",
   "templateName": "ETH/BTC",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006574685f627463000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "eth_btc"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xda5e925bd47a8ba9a11d694a9390113f5e6b42a6f5ff13769df41ff5fbfac0c5",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/eth_usd.json b/data/apis/Amberdata/beacons/eth_usd.json
index fe880355..045fed02 100644
--- a/data/apis/Amberdata/beacons/eth_usd.json
+++ b/data/apis/Amberdata/beacons/eth_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xd218d6d5f630faa290676bebe58c88f68a9dccbfece4a3028cf4a5539f397459",
   "templateName": "ETH/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006574685f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "eth_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x52775c1d7c61e5de2a64e58006f4ee1e0f7913dab0dd5d3e10f128c74167f4fe",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/fast gas on ethereum mainnet.json b/data/apis/Amberdata/beacons/fast gas on ethereum mainnet.json
index 0028d2df..65f23ab1 100644
--- a/data/apis/Amberdata/beacons/fast gas on ethereum mainnet.json	
+++ b/data/apis/Amberdata/beacons/fast gas on ethereum mainnet.json	
@@ -1,19 +1,8 @@
 {
   "templateId": "0x2ec4a6323e521ec60284b211c2a1348eedb0f2bfbd59c562f0e585226bd0aaf9",
   "templateName": "Fast Gas on Ethereum Mainnet",
-  "parameters": "0x31626200000000000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e666173742e67617350726963652c000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d7000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.fast.gasPrice,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xc23968ad473772ba741b021ccfeaf8400be8545b4036574381c062734f8ffd3e",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/knc_usd.json b/data/apis/Amberdata/beacons/knc_usd.json
index 81662292..bbd4df96 100644
--- a/data/apis/Amberdata/beacons/knc_usd.json
+++ b/data/apis/Amberdata/beacons/knc_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x930141b7fe75bba0c3fbfa5e0b1b006391cad76bea10562e434ca81b70876ba3",
   "templateName": "KNC/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006b6e635f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "knc_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x57d81bfd734c7a2b2376f65694760f160baac40a9a50a5fa2b93076b5e59a1eb",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/lrc_usd.json b/data/apis/Amberdata/beacons/lrc_usd.json
index ba7d2239..7eef95b0 100644
--- a/data/apis/Amberdata/beacons/lrc_usd.json
+++ b/data/apis/Amberdata/beacons/lrc_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x8473a4c5a894bf4724c4d7f7d06ed30019db0058941e5e87b9177514d2fa7308",
   "templateName": "LRC/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006c72635f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "lrc_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x1af88fcb9ea20c5ce0e02f1b7a63c13da0fa1af7fdca9ace39b75a41c78b95bc",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/mana_usd.json b/data/apis/Amberdata/beacons/mana_usd.json
index 16719500..d56e22d4 100644
--- a/data/apis/Amberdata/beacons/mana_usd.json
+++ b/data/apis/Amberdata/beacons/mana_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x5e5fb4b0b75160f1fe08b46e9703fb5cdac50498755cd89b23a4944c18448db0",
   "templateName": "MANA/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006d616e615f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "mana_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x674691ef4f4c1a8866fd680836c43b12d68d31bbd266827ead0681ad21b8b64b",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/matic_usd.json b/data/apis/Amberdata/beacons/matic_usd.json
index a23a72cc..25f2a9e5 100644
--- a/data/apis/Amberdata/beacons/matic_usd.json
+++ b/data/apis/Amberdata/beacons/matic_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xb43779b94ff444678da1f32a9076f1dc0d655b6a05377cdf9617a767b41a273a",
   "templateName": "MATIC/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006d617469635f75736400000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "matic_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x396d166d7dfdc87e317e7edb826c617324d3a0c770ab64b12e4a5ed8f4496e8d",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/near_usd.json b/data/apis/Amberdata/beacons/near_usd.json
index 724fa9e5..119cf872 100644
--- a/data/apis/Amberdata/beacons/near_usd.json
+++ b/data/apis/Amberdata/beacons/near_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x885b41879a473a215b74246c17c50aa99fe99b1ef9a91fc93e8e615621a2832a",
   "templateName": "NEAR/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000006e6561725f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "near_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xe0d9e7a3b702e130e17f90c765eaacd197755de0ca6b9140c359ea342b7d40cb",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/snx_usd.json b/data/apis/Amberdata/beacons/snx_usd.json
index 52ae06e9..c56aeb12 100644
--- a/data/apis/Amberdata/beacons/snx_usd.json
+++ b/data/apis/Amberdata/beacons/snx_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x2b599b828260838fe64c7e5b8a8f96253d24c32e17e9198cc34588c8e3971c2f",
   "templateName": "SNX/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000736e785f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "snx_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x475c73eec562aeb488722eee57ca9b8996bcc914b0f14dcab034fc786c79c729",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/sol_usd.json b/data/apis/Amberdata/beacons/sol_usd.json
index 525e8868..fe002499 100644
--- a/data/apis/Amberdata/beacons/sol_usd.json
+++ b/data/apis/Amberdata/beacons/sol_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xd5654f3c9e35c123fa13a6d324d7344840ef1cd7be06202e13645036cc7e94ae",
   "templateName": "SOL/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000736f6c5f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "sol_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x3b860569ebdc70019b048055b0e0662e3e7dbd68ff431310b65cd840db264ecb",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/uni_usd.json b/data/apis/Amberdata/beacons/uni_usd.json
index 57ed8ce5..1a370f35 100644
--- a/data/apis/Amberdata/beacons/uni_usd.json
+++ b/data/apis/Amberdata/beacons/uni_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xe2926977ca4e0621485c3510f03425b2015412fb08a70b32f8f559b737641ecc",
   "templateName": "UNI/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000756e695f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "uni_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xe100d9fcd6e4d66259b904881578792590eb550c7f58516c1e430ed476a95a0d",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/usdc_usd.json b/data/apis/Amberdata/beacons/usdc_usd.json
index 06a6796c..391261ea 100644
--- a/data/apis/Amberdata/beacons/usdc_usd.json
+++ b/data/apis/Amberdata/beacons/usdc_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0x396ee546168feb66804f32d30aa230447e09dfbf7c8f4182f0ebad17acff7615",
   "templateName": "USDC/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000757364635f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "usdc_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x6ab84a4c90a391770b8f1e2dbec458d50804cff6b053cfb5d14229f9bf898e5a",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/usdt_usd.json b/data/apis/Amberdata/beacons/usdt_usd.json
index 6409df75..dabb55d5 100644
--- a/data/apis/Amberdata/beacons/usdt_usd.json
+++ b/data/apis/Amberdata/beacons/usdt_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xb91c1c228b42faa43721a4dcd7eafa6432ad8c31e2e067708fc519967f54a2f8",
   "templateName": "USDT/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000757364745f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "usdt_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xa54941ccafb90cf1d40edb52d874a1d4113f899ce62013fd59360b1689da83d3",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/usdt_weth.json b/data/apis/Amberdata/beacons/usdt_weth.json
index e8d49272..740f3788 100644
--- a/data/apis/Amberdata/beacons/usdt_weth.json
+++ b/data/apis/Amberdata/beacons/usdt_weth.json
@@ -1,39 +1,8 @@
 {
   "templateId": "0x3ae8c3944b8522cbc865a8eea1392333d7471aed88bcfe06789a062473072118",
   "templateName": "USDT/WETH",
-  "parameters": "0x3153536262626200000000000000000000000000000000000000000000000000626173650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a071756f746500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a30786461633137663935386432656535323361323230363230363939343539376331336438333165633700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a30786330326161613339623232336665386430613065356334663237656164393038336337353663633200000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "base",
-      "type": "string",
-      "value": "0xdac17f958d2ee523a2206206994597c13d831ec7"
-    },
-    {
-      "name": "quote",
-      "type": "string",
-      "value": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x4dfdac845a3316b528a3ea88ae82abf48a7dfff45d0922e04e90c52576d60426",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/wbtc_usd.json b/data/apis/Amberdata/beacons/wbtc_usd.json
index 66408c6b..4eaf33f2 100644
--- a/data/apis/Amberdata/beacons/wbtc_usd.json
+++ b/data/apis/Amberdata/beacons/wbtc_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xdaf2dad42a8da921733d2f83acf1cc8c9aee77c6bc499fbb8b881e39d618a7bd",
   "templateName": "WBTC/USD",
-  "parameters": "0x31626262626200000000000000000000000000000000000000000000000000007061697200000000000000000000000000000000000000000000000000000000776274635f7573640000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "wbtc_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0xa360b20c4a4ac1180eb57887a03a81150779f0ebce62fa4fcfb43d3197ae3f74",
   "chains": [
     {
diff --git a/data/apis/Amberdata/beacons/yfi_usd.json b/data/apis/Amberdata/beacons/yfi_usd.json
index 06254379..4c419b59 100644
--- a/data/apis/Amberdata/beacons/yfi_usd.json
+++ b/data/apis/Amberdata/beacons/yfi_usd.json
@@ -1,34 +1,8 @@
 {
   "templateId": "0xc979c3c90aee8d4c67d6319cf7fe062463003c4a41ec2dc84206486bf6155e0d",
   "templateName": "YFI/USD",
-  "parameters": "0x316262626262000000000000000000000000000000000000000000000000000070616972000000000000000000000000000000000000000000000000000000007966695f757364000000000000000000000000000000000000000000000000005f706174680000000000000000000000000000000000000000000000000000007061796c6f61642e767761702c000000000000000000000000000000000000005f74797065000000000000000000000000000000000000000000000000000000696e743235362c74696d657374616d70000000000000000000000000000000005f74696d65730000000000000000000000000000000000000000000000000000313030303030302c0000000000000000000000000000000000000000000000006c6f6f6b6261636b506572696f640000000000000000000000000000000000003500000000000000000000000000000000000000000000000000000000000000",
-  "decodedParameters": [
-    {
-      "name": "pair",
-      "type": "bytes32",
-      "value": "yfi_usd"
-    },
-    {
-      "name": "_path",
-      "type": "bytes32",
-      "value": "payload.vwap,"
-    },
-    {
-      "name": "_type",
-      "type": "bytes32",
-      "value": "int256,timestamp"
-    },
-    {
-      "name": "_times",
-      "type": "bytes32",
-      "value": "1000000,"
-    },
-    {
-      "name": "lookbackPeriod",
-      "type": "bytes32",
-      "value": "5"
-    }
-  ],
+  "parameters": "0x",
+  "decodedParameters": [],
   "beaconId": "0x1b8ee8dd6f9f4293687a4ec61f964f884b58239a1bf60c9ea6210f6467478b5b",
   "chains": [
     {
diff --git a/data/apis/Amberdata/templates/aave_usd.json b/data/apis/Amberdata/templates/aave_usd.json
index 49a9b7e3..1dad35d2 100644
--- a/data/apis/Amberdata/templates/aave_usd.json
+++ b/data/apis/Amberdata/templates/aave_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "AAVE/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/atom_usd.json b/data/apis/Amberdata/templates/atom_usd.json
index d8970979..19549d34 100644
--- a/data/apis/Amberdata/templates/atom_usd.json
+++ b/data/apis/Amberdata/templates/atom_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "ATOM/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/avax_usd.json b/data/apis/Amberdata/templates/avax_usd.json
index 52f4ce35..561a44c4 100644
--- a/data/apis/Amberdata/templates/avax_usd.json
+++ b/data/apis/Amberdata/templates/avax_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "AVAX/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/average gas on ethereum mainnet.json b/data/apis/Amberdata/templates/average gas on ethereum mainnet.json
index 4868f76c..003a6d6b 100644
--- a/data/apis/Amberdata/templates/average gas on ethereum mainnet.json	
+++ b/data/apis/Amberdata/templates/average gas on ethereum mainnet.json	
@@ -15,6 +15,5 @@
       "value": "int256,timestamp"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "goerli", "polygon-mumbai"],
-  "templateName": "Average Gas on Ethereum Mainnet"
+  "chains": ["ropsten", "rinkeby", "goerli", "polygon-mumbai"]
 }
diff --git a/data/apis/Amberdata/templates/bal_usd.json b/data/apis/Amberdata/templates/bal_usd.json
index 78cbb653..c0b4826b 100644
--- a/data/apis/Amberdata/templates/bal_usd.json
+++ b/data/apis/Amberdata/templates/bal_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "BAL/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/bat_usd.json b/data/apis/Amberdata/templates/bat_usd.json
index 94b25fbd..9cb572cf 100644
--- a/data/apis/Amberdata/templates/bat_usd.json
+++ b/data/apis/Amberdata/templates/bat_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "BAT/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/btc_usd.json b/data/apis/Amberdata/templates/btc_usd.json
index 511d6511..178b803b 100644
--- a/data/apis/Amberdata/templates/btc_usd.json
+++ b/data/apis/Amberdata/templates/btc_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "BTC/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/comp_usd.json b/data/apis/Amberdata/templates/comp_usd.json
index cd72a824..b5835dfc 100644
--- a/data/apis/Amberdata/templates/comp_usd.json
+++ b/data/apis/Amberdata/templates/comp_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "COMP/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/dai_usd.json b/data/apis/Amberdata/templates/dai_usd.json
index a9ba8c89..11d2771b 100644
--- a/data/apis/Amberdata/templates/dai_usd.json
+++ b/data/apis/Amberdata/templates/dai_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "DAI/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/eth_btc.json b/data/apis/Amberdata/templates/eth_btc.json
index e1661dca..86a3fef1 100644
--- a/data/apis/Amberdata/templates/eth_btc.json
+++ b/data/apis/Amberdata/templates/eth_btc.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "ETH/BTC"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/eth_usd.json b/data/apis/Amberdata/templates/eth_usd.json
index 9771d660..b2efb1cd 100644
--- a/data/apis/Amberdata/templates/eth_usd.json
+++ b/data/apis/Amberdata/templates/eth_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "ETH/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/fast gas on ethereum mainnet.json b/data/apis/Amberdata/templates/fast gas on ethereum mainnet.json
index 809609fd..1f13b5e0 100644
--- a/data/apis/Amberdata/templates/fast gas on ethereum mainnet.json	
+++ b/data/apis/Amberdata/templates/fast gas on ethereum mainnet.json	
@@ -15,6 +15,5 @@
       "value": "int256,timestamp"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "Fast Gas on Ethereum Mainnet"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/knc_usd.json b/data/apis/Amberdata/templates/knc_usd.json
index ca65e653..7cecc1cd 100644
--- a/data/apis/Amberdata/templates/knc_usd.json
+++ b/data/apis/Amberdata/templates/knc_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "KNC/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/lrc_usd.json b/data/apis/Amberdata/templates/lrc_usd.json
index 2d19fbe0..0a72f450 100644
--- a/data/apis/Amberdata/templates/lrc_usd.json
+++ b/data/apis/Amberdata/templates/lrc_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "LRC/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/mana_usd.json b/data/apis/Amberdata/templates/mana_usd.json
index 4f018813..208b9f37 100644
--- a/data/apis/Amberdata/templates/mana_usd.json
+++ b/data/apis/Amberdata/templates/mana_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "MANA/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/matic_usd.json b/data/apis/Amberdata/templates/matic_usd.json
index 4ecafa94..b26b9f6d 100644
--- a/data/apis/Amberdata/templates/matic_usd.json
+++ b/data/apis/Amberdata/templates/matic_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "MATIC/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/near_usd.json b/data/apis/Amberdata/templates/near_usd.json
index 4aa5e30b..18460380 100644
--- a/data/apis/Amberdata/templates/near_usd.json
+++ b/data/apis/Amberdata/templates/near_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "NEAR/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/snx_usd.json b/data/apis/Amberdata/templates/snx_usd.json
index 08947173..88b22e15 100644
--- a/data/apis/Amberdata/templates/snx_usd.json
+++ b/data/apis/Amberdata/templates/snx_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "SNX/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/sol_usd.json b/data/apis/Amberdata/templates/sol_usd.json
index eb138a35..cdf40f47 100644
--- a/data/apis/Amberdata/templates/sol_usd.json
+++ b/data/apis/Amberdata/templates/sol_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "SOL/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/uni_usd.json b/data/apis/Amberdata/templates/uni_usd.json
index 188423b9..7e6b9e99 100644
--- a/data/apis/Amberdata/templates/uni_usd.json
+++ b/data/apis/Amberdata/templates/uni_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "UNI/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/usdc_usd.json b/data/apis/Amberdata/templates/usdc_usd.json
index 3d477072..70160a4a 100644
--- a/data/apis/Amberdata/templates/usdc_usd.json
+++ b/data/apis/Amberdata/templates/usdc_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "USDC/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/usdt_usd.json b/data/apis/Amberdata/templates/usdt_usd.json
index 09f46936..22a25b4e 100644
--- a/data/apis/Amberdata/templates/usdt_usd.json
+++ b/data/apis/Amberdata/templates/usdt_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "USDT/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/usdt_weth.json b/data/apis/Amberdata/templates/usdt_weth.json
index 09ad63e4..ab39de2f 100644
--- a/data/apis/Amberdata/templates/usdt_weth.json
+++ b/data/apis/Amberdata/templates/usdt_weth.json
@@ -35,6 +35,5 @@
       "value": "5"
     }
   ],
-  "chains": ["goerli", "polygon-mumbai", "ropsten", "rinkeby"],
-  "templateName": "USDT/WETH"
+  "chains": ["goerli", "polygon-mumbai", "ropsten", "rinkeby"]
 }
diff --git a/data/apis/Amberdata/templates/wbtc_usd.json b/data/apis/Amberdata/templates/wbtc_usd.json
index e7a73b9c..dbc81e5b 100644
--- a/data/apis/Amberdata/templates/wbtc_usd.json
+++ b/data/apis/Amberdata/templates/wbtc_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "WBTC/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/apis/Amberdata/templates/yfi_usd.json b/data/apis/Amberdata/templates/yfi_usd.json
index 65f5de09..870882fb 100644
--- a/data/apis/Amberdata/templates/yfi_usd.json
+++ b/data/apis/Amberdata/templates/yfi_usd.json
@@ -30,6 +30,5 @@
       "value": "5"
     }
   ],
-  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"],
-  "templateName": "YFI/USD"
+  "chains": ["ropsten", "rinkeby", "polygon-mumbai", "goerli"]
 }
diff --git a/data/chains.json b/data/chains.json
index dbf63560..b0e6837b 100644
--- a/data/chains.json
+++ b/data/chains.json
@@ -6,13 +6,6 @@
     "RequesterAuthorizerWithManager": "0x0d288Ba0B890c9D3DF6F1e4AE3c286F335eBd593",
     "RrpBeaconServer": "0x2cFda716b751eb406C5124C6E4428F2AEA453D96"
   },
-  "mumbai": {
-    "AirnodeRrp": "0xA4899D35897033b927acFCf422bc745916139776",
-    "AccessControlRegistry": "0xf953b3A269d80e3eB0F2947630Da976B896A8C5b",
-    "OwnableCallForwarder": "0xAA292E8611aDF267e563f334Ee42320aC96D0463",
-    "RequesterAuthorizerWithManager": "0x5c74c94173F05dA1720953407cbb920F3DF9f887",
-    "RrpBeaconServer": "0x720472c8ce72c2A2D711333e064ABD3E6BbEAdd3"
-  },
   "polygon-mumbai": {
     "AirnodeRrp": "0x68E36bEeDA1644258973E532029fc3a2806bBA8b",
     "AccessControlRegistry": "0xa59A67b7b50943B559ed79dF7a36a7Be5C67F5F3",
diff --git a/data/documentation_metadata.json b/data/documentation_metadata.json
index 75db6695..7efaed70 100644
--- a/data/documentation_metadata.json
+++ b/data/documentation_metadata.json
@@ -859,13 +859,6 @@
       "RequesterAuthorizerWithManager": "0x0d288Ba0B890c9D3DF6F1e4AE3c286F335eBd593",
       "RrpBeaconServer": "0x2cFda716b751eb406C5124C6E4428F2AEA453D96"
     },
-    "mumbai": {
-      "AirnodeRrp": "0xA4899D35897033b927acFCf422bc745916139776",
-      "AccessControlRegistry": "0xf953b3A269d80e3eB0F2947630Da976B896A8C5b",
-      "OwnableCallForwarder": "0xAA292E8611aDF267e563f334Ee42320aC96D0463",
-      "RequesterAuthorizerWithManager": "0x5c74c94173F05dA1720953407cbb920F3DF9f887",
-      "RrpBeaconServer": "0x720472c8ce72c2A2D711333e064ABD3E6BbEAdd3"
-    },
     "polygon-mumbai": {
       "AirnodeRrp": "0x68E36bEeDA1644258973E532029fc3a2806bBA8b",
       "AccessControlRegistry": "0xa59A67b7b50943B559ed79dF7a36a7Be5C67F5F3",
diff --git a/src/export-documentation.ts b/src/export-documentation.ts
index d506eb49..77353969 100644
--- a/src/export-documentation.ts
+++ b/src/export-documentation.ts
@@ -1,13 +1,16 @@
 import { join } from 'path';
 import { readdirSync, rmSync, writeFileSync } from 'fs';
 import { readJsonDirectoryAsArray, readJsonFile } from './utils';
-import { BeaconDescriptor } from './types';
+import { BeaconDescriptor, TemplateDescriptor } from './types';
 
 const exportDocumentation = () => {
   const dataBasePath = join(__dirname, '..', 'data');
   const apisBasePath = join(dataBasePath, 'apis');
 
   const beacons = readdirSync(apisBasePath).flatMap((apiName) => {
+    const templates = readJsonDirectoryAsArray(
+      join(apisBasePath, apiName, 'templates')
+    ) as unknown as TemplateDescriptor[];
     const beacons = readJsonDirectoryAsArray(join(apisBasePath, apiName, 'beacons')) as unknown as BeaconDescriptor[];
 
     return beacons.map((beacon) => {
@@ -18,6 +21,7 @@ const exportDocumentation = () => {
         templateName: beacon.templateName,
         filename: undefined,
         parameters: undefined,
+        decodedParameters: templates.find((template) => template.templateId === beacon.templateId).decodedParameters,
       };
     });
   });
diff --git a/src/types.ts b/src/types.ts
index 3365bfe8..a971af66 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -13,3 +13,12 @@ export interface BeaconDescriptor {
   readonly chains: ChainDescriptor[];
   readonly filename?: string;
 }
+
+export interface TemplateDescriptor {
+  readonly templateId: string;
+  readonly endpointId: string;
+  readonly airnode: string;
+  readonly parameters: string;
+  readonly decodedParameters: { name: string; type: string; value; string }[];
+  readonly chains: string[];
+}