diff --git a/abis/OpenDiamond.json b/abis/OpenDiamond.json
index 46140ac..13587db 100644
--- a/abis/OpenDiamond.json
+++ b/abis/OpenDiamond.json
@@ -1,4 +1,226 @@
 [
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "market",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "commitment",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "loanId",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "accruedInterest",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "timestamp",
+          "type": "uint256"
+        }
+      ],
+      "name": "BorrowAprAccrued",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "market",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "commitment",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "fee",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "timestamp",
+          "type": "uint256"
+        }
+      ],
+      "name": "LoanFee",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "market",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "commitment",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "fee",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "timestamp",
+          "type": "uint256"
+        }
+      ],
+      "name": "WithdrawCollateralFee",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "market",
+          "type": "bytes32"
+        },
+        {
+          "indexed": true,
+          "internalType": "bytes32",
+          "name": "commitment",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "depositId",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "accruedInterest",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "timestamp",
+          "type": "uint256"
+        }
+      ],
+      "name": "SavingsAprAccrued",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "market",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "commitment",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "interestRate",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "time",
+          "type": "uint256"
+        }
+      ],
+      "name": "BorrowInterestRateUpdated",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "market",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "bytes32",
+          "name": "commitment",
+          "type": "bytes32"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "interestRate",
+          "type": "uint256"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "time",
+          "type": "uint256"
+        }
+      ],
+      "name": "DepositInterestRateUpdated",
+      "type": "event"
+    },
     {
         "type": "event",
         "anonymous": false,
@@ -18,14 +240,14 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
     {
         "type": "event",
         "anonymous": false,
-        "name": "APYupdated",
+        "name": "CollateralFactorUpdated",
         "inputs":
         [
             {
@@ -35,13 +257,18 @@
             },
             {
                 "type": "uint256",
-                "name": "newAPY",
+                "name": "oldCollateralFactor",
+                "indexed": false
+            },
+            {
+                "type": "uint256",
+                "name": "newCollateralFactor",
                 "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -69,7 +296,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -97,7 +324,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -153,7 +380,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -181,7 +408,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -209,7 +436,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -237,7 +464,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -265,7 +492,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -293,7 +520,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -377,7 +604,35 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
+                "indexed": false
+            }
+        ]
+    },
+    {
+        "type": "event",
+        "anonymous": false,
+        "name": "TimelockValidityDeposit",
+        "inputs":
+        [
+            {
+                "type": "address",
+                "name": "admin",
                 "indexed": true
+            },
+            {
+                "type": "uint256",
+                "name": "oldTime",
+                "indexed": false
+            },
+            {
+                "type": "uint256",
+                "name": "newTime",
+                "indexed": true
+            },
+            {
+                "type": "uint256",
+                "name": "timestamp",
+                "indexed": false
             }
         ]
     },
@@ -405,7 +660,30 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
+                "indexed": false
+            }
+        ]
+    },
+    {
+        "type": "event",
+        "anonymous": false,
+        "name": "savingsAPRupdated",
+        "inputs":
+        [
+            {
+                "type": "address",
+                "name": "admin",
                 "indexed": true
+            },
+            {
+                "type": "uint256",
+                "name": "newsavingsAPR",
+                "indexed": true
+            },
+            {
+                "type": "uint256",
+                "name": "timestamp",
+                "indexed": false
             }
         ]
     },
@@ -428,12 +706,12 @@
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "amount",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
@@ -461,12 +739,12 @@
             {
                 "type": "bytes32",
                 "name": "market",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
@@ -476,7 +754,7 @@
             {
                 "type": "uint256",
                 "name": "amount",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
@@ -509,12 +787,12 @@
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "amount",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
@@ -541,45 +819,7 @@
             },
             {
                 "type": "bool",
-                "name": "isPaused",
-                "indexed": false
-            }
-        ]
-    },
-    {
-        "type": "event",
-        "anonymous": false,
-        "name": "SavingsAprAccrued",
-        "inputs":
-        [
-            {
-                "type": "address",
-                "name": "account",
-                "indexed": false
-            },
-            {
-                "type": "bytes32",
-                "name": "market",
-                "indexed": false
-            },
-            {
-                "type": "bytes32",
-                "name": "commitment",
-                "indexed": false
-            },
-            {
-                "type": "uint256",
-                "name": "depositId",
-                "indexed": false
-            },
-            {
-                "type": "uint256",
-                "name": "accruedInterest",
-                "indexed": false
-            },
-            {
-                "type": "uint256",
-                "name": "timestamp",
+                "name": "isPaused",
                 "indexed": false
             }
         ]
@@ -607,10 +847,6 @@
                     {
                         "type": "bytes4[]",
                         "name": "functionSelectors"
-                    },
-                    {
-                        "type": "uint8",
-                        "name": "facetId"
                     }
                 ]
             },
@@ -658,17 +894,17 @@
             {
                 "type": "uint256",
                 "name": "minBorrowInterest",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "maxBorrowInterest",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -686,17 +922,17 @@
             {
                 "type": "uint256",
                 "name": "minDepositInterest",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "maxDepositInterest",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -714,17 +950,17 @@
             {
                 "type": "uint256",
                 "name": "factor",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "correlationFactor",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -742,7 +978,7 @@
             {
                 "type": "uint256",
                 "name": "timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -843,10 +1079,6 @@
                     {
                         "type": "bytes4[]",
                         "name": "functionSelectors"
-                    },
-                    {
-                        "type": "uint8",
-                        "name": "facetId"
                     }
                 ]
             },
@@ -927,17 +1159,17 @@
             {
                 "type": "bytes32",
                 "name": "market",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "id",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
@@ -965,12 +1197,12 @@
             {
                 "type": "bytes32",
                 "name": "loanMarket",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bool",
@@ -980,12 +1212,12 @@
             {
                 "type": "bytes32",
                 "name": "currentMarket",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
                 "name": "amount",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
@@ -1026,17 +1258,17 @@
             {
                 "type": "bytes32",
                 "name": "market",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
                 "name": "amount",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
@@ -1064,22 +1296,22 @@
             {
                 "type": "uint256",
                 "name": "id",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
                 "name": "amount",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "bytes32",
                 "name": "market",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
@@ -1102,12 +1334,12 @@
             {
                 "type": "bytes32",
                 "name": "loanMarket",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
@@ -1127,11 +1359,11 @@
             {
                 "type": "uint256",
                 "name": "loanId",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "uint256",
-                "name": "initialLoanAmount",
+                "name": "feePaid",
                 "indexed": false
             },
             {
@@ -1173,7 +1405,7 @@
             {
                 "type": "uint256",
                 "name": "id",
-                "indexed": true
+                "indexed": false
             },
             {
                 "type": "bytes32",
@@ -1183,7 +1415,7 @@
             {
                 "type": "bytes32",
                 "name": "commitment",
-                "indexed": false
+                "indexed": true
             },
             {
                 "type": "uint256",
@@ -1280,7 +1512,7 @@
             {
                 "type": "uint256",
                 "name": "_timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -1298,7 +1530,7 @@
             {
                 "type": "uint256",
                 "name": "_timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -1326,7 +1558,7 @@
             {
                 "type": "uint256",
                 "name": "_timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -1354,7 +1586,7 @@
             {
                 "type": "uint256",
                 "name": "_timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -1372,7 +1604,7 @@
             {
                 "type": "uint256",
                 "name": "_timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -1400,7 +1632,7 @@
             {
                 "type": "uint256",
                 "name": "_timestamp",
-                "indexed": true
+                "indexed": false
             }
         ]
     },
@@ -1421,184 +1653,5 @@
                 "indexed": false
             }
         ]
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "market",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "commitment",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "loanId",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "accruedInterest",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "timestamp",
-          "type": "uint256"
-        }
-      ],
-      "name": "BorrowAprAccrued",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "market",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "commitment",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "fee",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "timestamp",
-          "type": "uint256"
-        }
-      ],
-      "name": "WithdrawCollateralFee",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "market",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "commitment",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "fee",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "timestamp",
-          "type": "uint256"
-        }
-      ],
-      "name": "LoanFee",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "market",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "commitment",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "interestRate",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "time",
-          "type": "uint256"
-        }
-      ],
-      "name": "BorrowInterestRateUpdated",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "market",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "bytes32",
-          "name": "commitment",
-          "type": "bytes32"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "interestRate",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "time",
-          "type": "uint256"
-        }
-      ],
-      "name": "DepositInterestRateUpdated",
-      "type": "event"
     }
 ]
\ No newline at end of file
diff --git a/generated/OpenDiamond/OpenDiamond.ts b/generated/OpenDiamond/OpenDiamond.ts
index c8d3fc8..9a8869f 100644
--- a/generated/OpenDiamond/OpenDiamond.ts
+++ b/generated/OpenDiamond/OpenDiamond.ts
@@ -1213,7 +1213,7 @@ export class NewLoan__Params {
     return this._event.parameters[6].value.toBigInt();
   }
 
-  get initialLoanAmount(): BigInt {
+  get feePaid(): BigInt {
     return this._event.parameters[7].value.toBigInt();
   }
 
diff --git a/src/mapping.ts b/src/mapping.ts
index 9926c3b..ade4c28 100644
--- a/src/mapping.ts
+++ b/src/mapping.ts
@@ -50,7 +50,7 @@ import { User, Deposit, Reserve, Loan, Collateral, Utilisation, Apr } from "../g
 
 export function handleAPRupdated(event: APRupdated): void {}
 
-export function handleAPYupdated(event: APYupdated): void {}
+export function handleSavingsAPRupdated(event: APYupdated): void {}
 
 export function handleCollateralPreClosureFeesUpdated(
   event: CollateralPreClosureFeesUpdated
@@ -565,13 +565,13 @@ export function handleNewLoan(event: NewLoan): void {
 
   let loan = new Loan(entityId)
   loan.initialMarket = event.params.loanMarket.toString()
-  loan.initialAmount = event.params.initialLoanAmount
+  loan.initialAmount = event.params.loanAmount
   loan.commitment = event.params.commitment.toString()
   loan.currentMarket = event.params.loanMarket.toString()
   loan.currentAmount = event.params.loanAmount
   loan.isSwapped = false
   loan.state = 'active'
-  loan.feePaid = event.params.initialLoanAmount - event.params.loanAmount
+  loan.feePaid = event.params.feePaid
   loan.interestAccrued = BigInt.fromI32(0)
   loan.collateral = event.transaction.hash.toHexString()
   loan.user = event.params.account.toHexString()
@@ -736,6 +736,7 @@ export function handleLoanRepaid(event: LoanRepaid): void {
   //update loan records
   loan.state = 'repaid'
   loan.currentAmount = BigInt.fromI32(0)
+  loan.updatedAt = timestamp
   loan.save()
 }
 
diff --git a/subgraph.yaml b/subgraph.yaml
index c710a9b..2b8fb91 100644
--- a/subgraph.yaml
+++ b/subgraph.yaml
@@ -6,9 +6,9 @@ dataSources:
     name: OpenDiamond
     network: chapel
     source:
-      address: "0x5eE1b04A194e812D78c700D675f6baD410EE93D7"
+      address: "0x12bdAC56C03FA27687c6f35E60fC36BecB00850e"
       abi: OpenDiamond
-      startBlock: 18268105
+      startBlock: 18748470
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.5
@@ -58,51 +58,51 @@ dataSources:
         - name: OpenDiamond
           file: ./abis/OpenDiamond.json
       eventHandlers:
-        - event: APRupdated(indexed address,indexed uint256,indexed uint256)
+        - event: APRupdated(indexed address,indexed uint256,uint256)
           handler: handleAPRupdated
-        - event: APYupdated(indexed address,indexed uint256,indexed uint256)
-          handler: handleAPYupdated
-        - event: CollateralPreClosureFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: savingsAPRupdated(indexed address,indexed uint256,uint256)
+          handler: handleSavingsAPRupdated
+        - event: CollateralPreClosureFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleCollateralPreClosureFeesUpdated
-        - event: CollateralReleaseFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: CollateralReleaseFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleCollateralReleaseFeesUpdated
         - event: CommitmentAdded(indexed address,indexed bytes32,indexed uint256,uint256)
           handler: handleCommitmentAdded
-        - event: DepositPreClosureFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: DepositPreClosureFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleDepositPreClosureFeesUpdated
-        - event: DepositWithdrawalFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: DepositWithdrawalFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleDepositWithdrawalFeesUpdated
-        - event: LoanClosureFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: LoanClosureFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleLoanClosureFeesUpdated
-        - event: LoanIssuanceFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: LoanIssuanceFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleLoanIssuanceFeesUpdated
-        - event: LoanPreClosureFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: LoanPreClosureFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleLoanPreClosureFeesUpdated
-        - event: MarketSwapFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: MarketSwapFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleMarketSwapFeesUpdated
         - event: MaxWithdrawalUpdated(indexed address,indexed uint256,indexed uint256,uint256,uint256,uint256)
           handler: handleMaxWithdrawalUpdated
         - event: PauseState(indexed address,bool)
           handler: handlePauseState
-        - event: ReserveFactorUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: ReserveFactorUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleReserveFactorUpdated
-        - event: YieldConversionFeesUpdated(indexed address,uint256,indexed uint256,indexed uint256)
+        - event: YieldConversionFeesUpdated(indexed address,uint256,indexed uint256,uint256)
           handler: handleYieldConversionFeesUpdated
-        - event: DepositAdded(indexed address,indexed bytes32,bytes32,indexed uint256,uint256,uint256)
+        - event: DepositAdded(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleDepositAdded
-        - event: DepositWithdrawal(indexed address,bytes32,bytes32,uint256,indexed uint256,uint256,uint256)
+        - event: DepositWithdrawal(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256,uint256)
           handler: handleDepositWithdrawal
-        - event: NewDeposit(indexed address,indexed bytes32,bytes32,indexed uint256,uint256,uint256)
+        - event: NewDeposit(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleNewDeposit
-        - event: DiamondCut((address,uint8,bytes4[],uint8)[],address,bytes)
+        - event: DiamondCut((address,uint8,bytes4[])[],address,bytes)
           handler: handleDiamondCut
-        - event: BorrowInterestUpdated(indexed address,uint256,uint256,indexed uint256)
+        - event: BorrowInterestUpdated(indexed address,indexed uint256,indexed uint256,uint256)
           handler: handleBorrowInterestUpdated
-        - event: DepositInterestUpdated(indexed address,uint256,uint256,indexed uint256)
+        - event: DepositInterestUpdated(indexed address,indexed uint256,indexed uint256,uint256)
           handler: handleDepositInterestUpdated
-        - event: InterestFactorsUpdated(indexed address,uint256,uint256,indexed uint256)
+        - event: InterestFactorsUpdated(indexed address,indexed uint256,indexed uint256,uint256)
           handler: handleInterestFactorsUpdated
-        - event: InterestsUpdated(indexed address,indexed uint256)
+        - event: InterestsUpdated(indexed address,uint256)
           handler: handleInterestsUpdated
         - event: TokenSupportAdded(indexed address,indexed uint256,indexed uint256,uint256)
           handler: handleTokenSupportAdded
@@ -110,35 +110,35 @@ dataSources:
           handler: handleTokensIssued
         - event: Liquidation(indexed address,indexed bytes32,indexed bytes32,uint256,uint256)
           handler: handleLiquidation
-        - event: AddCollateral(indexed address,bytes32,bytes32,indexed uint256,uint256,uint256)
+        - event: AddCollateral(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleAddCollateral
-        - event: MarketSwapped(indexed address,bytes32,bytes32,bool,indexed bytes32,indexed uint256,uint256)
+        - event: MarketSwapped(indexed address,indexed bytes32,indexed bytes32,bool,bytes32,uint256,uint256)
           handler: handleMarketSwapped
-        - event: WithdrawCollateral(indexed address,bytes32,bytes32,indexed uint256,uint256,uint256)
+        - event: WithdrawCollateral(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleWithdrawCollateral
-        - event: WithdrawPartialLoan(indexed address,indexed uint256,indexed uint256,bytes32,bytes32,uint256)
+        - event: WithdrawPartialLoan(indexed address,uint256,uint256,indexed bytes32,indexed bytes32,uint256)
           handler: handleWithdrawPartialLoan
-        - event: NewLoan(indexed address,bytes32,bytes32,uint256,bytes32,uint256,indexed uint256,uint256,uint256)
+        - event: NewLoan(indexed address,indexed bytes32,indexed bytes32,uint256,bytes32,uint256,uint256,uint256,uint256)
           handler: handleNewLoan
-        - event: LoanRepaid(indexed address,indexed uint256,indexed bytes32,bytes32,uint256,uint256,uint256)
+        - event: LoanRepaid(indexed address,uint256,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleLoanRepaid
-        - event: Market2Added(indexed bytes32,uint256,indexed address,indexed uint256)
+        - event: Market2Added(indexed bytes32,uint256,indexed address,uint256)
           handler: handleMarket2Added
-        - event: Market2Removed(indexed bytes32,indexed uint256)
+        - event: Market2Removed(indexed bytes32,uint256)
           handler: handleMarket2Removed
-        - event: Market2Updated(indexed bytes32,uint256,indexed address,indexed uint256)
+        - event: Market2Updated(indexed bytes32,uint256,indexed address,uint256)
           handler: handleMarket2Updated
-        - event: MarketSupportAdded(indexed bytes32,uint256,indexed address,indexed uint256)
+        - event: MarketSupportAdded(indexed bytes32,uint256,indexed address,uint256)
           handler: handleMarketSupportAdded
-        - event: MarketSupportRemoved(indexed bytes32,indexed uint256)
+        - event: MarketSupportRemoved(indexed bytes32,uint256)
           handler: handleMarketSupportRemoved
-        - event: MarketSupportUpdated(indexed bytes32,uint256,indexed address,indexed uint256)
+        - event: MarketSupportUpdated(indexed bytes32,uint256,indexed address,uint256)
           handler: handleMarketSupportUpdated
-        - event: SavingsAprAccrued(address,bytes32,bytes32,uint256,uint256,uint256)
+        - event: SavingsAprAccrued(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleSavingsAprAccrued
-        - event: BorrowAprAccrued(address,bytes32,bytes32,uint256,uint256,uint256)
+        - event: BorrowAprAccrued(indexed address,indexed bytes32,indexed bytes32,uint256,uint256,uint256)
           handler: handleBorrowAprAccrued
-        - event: WithdrawCollateralFee(indexed address,bytes32,bytes32,uint256,uint256)
+        - event: WithdrawCollateralFee(indexed address,indexed bytes32,indexed bytes32,uint256,uint256)
           handler: handleWithdrawCollateralFee
         - event: LoanFee(indexed address,bytes32,bytes32,uint256,uint256)
           handler: handleLoanFee