diff --git a/abis/ERC20Template3.json b/abis/ERC20Template3.json
index d351b1f..3f53d32 100644
--- a/abis/ERC20Template3.json
+++ b/abis/ERC20Template3.json
@@ -178,19 +178,6 @@
       "name": "MinterProposed",
       "type": "event"
     },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "dispenserContract",
-          "type": "address"
-        }
-      ],
-      "name": "NewDispenser",
-      "type": "event"
-    },
     {
       "anonymous": false,
       "inputs": [
@@ -222,6 +209,37 @@
       "name": "NewFixedRate",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "caller",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "_newPaymentCollector",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "timestamp",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        }
+      ],
+      "name": "NewPaymentCollector",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -240,7 +258,7 @@
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch",
           "type": "uint256"
         }
       ],
@@ -524,7 +542,7 @@
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "blocksPerEpoch",
+          "name": "secondsPerEpoch",
           "type": "uint256"
         }
       ],
@@ -537,19 +555,19 @@
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "blocksPerEpoch",
+          "name": "secondsPerEpoch",
           "type": "uint256"
         },
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "blocksPerSubscription",
+          "name": "secondsPerSubscription",
           "type": "uint256"
         },
         {
           "indexed": false,
           "internalType": "uint256",
-          "name": "trueValueSubmitTimeoutBlock",
+          "name": "trueValueSubmitTimeout",
           "type": "uint256"
         },
         {
@@ -747,51 +765,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "blocknum",
-          "type": "uint256"
-        }
-      ],
-      "name": "blocknumIsOnSlot",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "blocksPerEpoch",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "blocksPerSubscription",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -1055,25 +1028,6 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "blocknum",
-          "type": "uint256"
-        }
-      ],
-      "name": "epoch",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
         {
@@ -1110,8 +1064,40 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
+        },
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "userAddress",
+              "type": "address"
+            },
+            {
+              "internalType": "uint8",
+              "name": "v",
+              "type": "uint8"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "r",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "s",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "uint256",
+              "name": "validUntil",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct ERC20Template3.userAuth",
+          "name": "_userAuth",
+          "type": "tuple"
         }
       ],
       "name": "getAggPredval",
@@ -1242,13 +1228,45 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         },
         {
           "internalType": "address",
           "name": "predictoor",
           "type": "address"
+        },
+        {
+          "components": [
+            {
+              "internalType": "address",
+              "name": "userAddress",
+              "type": "address"
+            },
+            {
+              "internalType": "uint8",
+              "name": "v",
+              "type": "uint8"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "r",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "bytes32",
+              "name": "s",
+              "type": "bytes32"
+            },
+            {
+              "internalType": "uint256",
+              "name": "validUntil",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct ERC20Template3.userAuth",
+          "name": "_userAuth",
+          "type": "tuple"
         }
       ],
       "name": "getPrediction",
@@ -1311,11 +1329,11 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         }
       ],
-      "name": "getSubscriptionRevenueAtBlock",
+      "name": "getsubscriptionRevenueAtEpoch",
       "outputs": [
         {
           "internalType": "uint256",
@@ -1533,7 +1551,7 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         },
         {
@@ -1593,26 +1611,7 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
-          "type": "uint256"
-        }
-      ],
-      "name": "railBlocknumToSlot",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         }
       ],
@@ -1648,14 +1647,40 @@
       "type": "function"
     },
     {
-      "inputs": [
+      "inputs": [],
+      "name": "secondsPerEpoch",
+      "outputs": [
         {
-          "internalType": "bytes",
-          "name": "_value",
-          "type": "bytes"
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
         }
       ],
-      "name": "setData",
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "secondsPerSubscription",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_newFeeCollector",
+          "type": "address"
+        }
+      ],
+      "name": "setFeeCollector",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -1700,11 +1725,11 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "prediction_block",
+          "name": "prediction_ts",
           "type": "uint256"
         }
       ],
-      "name": "soonestBlockToPredict",
+      "name": "soonestEpochToPredict",
       "outputs": [
         {
           "internalType": "uint256",
@@ -1829,7 +1854,7 @@
         },
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         }
       ],
@@ -1842,7 +1867,7 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         },
         {
@@ -1870,7 +1895,7 @@
       "inputs": [
         {
           "internalType": "uint256",
-          "name": "blocknum",
+          "name": "epoch_start",
           "type": "uint256"
         },
         {
@@ -1927,6 +1952,25 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "_timestamp",
+          "type": "uint256"
+        }
+      ],
+      "name": "toEpochStart",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "totalSupply",
@@ -1995,7 +2039,7 @@
     },
     {
       "inputs": [],
-      "name": "trueValSubmitTimeoutBlock",
+      "name": "trueValSubmitTimeout",
       "outputs": [
         {
           "internalType": "uint256",
@@ -2027,11 +2071,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "s_per_block",
-          "type": "uint256"
-        },
         {
           "internalType": "uint256",
           "name": "s_per_subscription",
diff --git a/schema.graphql b/schema.graphql
index 6b95606..abf4140 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -742,7 +742,7 @@ type PredictSettingUpdate @entity{
   predictContract: PredictContract!
   secondsPerEpoch: BigInt!
   secondsPerSubscription: BigInt!
-  truevalSubmitTimeoutBlock: BigInt!
+  truevalSubmitTimeout: BigInt!
   stakeToken: Token
   "txId"
   txId: String
@@ -759,7 +759,7 @@ type PredictContract @entity{
   subscriptions: [PredictSubscription!] @derivedFrom(field: "predictContract")
   secondsPerEpoch: BigInt!
   secondsPerSubscription: BigInt!
-  truevalSubmitTimeoutBlock: BigInt!
+  truevalSubmitTimeout: BigInt!
   stakeToken: Token
   "creation txId"
   txId: String
diff --git a/src/mappings/utils/tokenUtils.ts b/src/mappings/utils/tokenUtils.ts
index 89fdbc7..39e4ffe 100644
--- a/src/mappings/utils/tokenUtils.ts
+++ b/src/mappings/utils/tokenUtils.ts
@@ -134,9 +134,9 @@ export function createPredictContract(address: Address): PredictContract {
   const predictContract = new PredictContract(address.toHexString())
   const token = getToken(address, true)
   predictContract.token = token.id
-  predictContract.blocksPerEpoch = BigInt.zero()
-  predictContract.blocksPerSubscription = BigInt.zero()
-  predictContract.truevalSubmitTimeoutBlock = BigInt.zero()
+  predictContract.secondsPerEpoch = BigInt.zero()
+  predictContract.secondsPerSubscription = BigInt.zero()
+  predictContract.truevalSubmitTimeout = BigInt.zero()
   predictContract.stakeToken = null
   predictContract.txId = ''
   predictContract.timestamp = 0