diff --git a/networks.json b/networks.json
index 2a1f944..bc0c2e2 100644
--- a/networks.json
+++ b/networks.json
@@ -1,7 +1,14 @@
 {
   "matic": {
-    "undefined": {
-      "address": "0x6Bf41D02026b5B21F2a0bb0880b8545768a7151f"
+    "InstaAutomation": {
+      "address": "0x3cF499Dbd2aBB6505f48Db27a9871523A38e6e2C",
+      "startBlock": 31471200
+    }
+  },
+  "avalanche": {
+    "InstaAutomation": {
+      "address": "0x08c1c01be430C9381AD2794412C3E940254CD97c",
+      "startBlock": 18160000
     }
   }
-}
\ No newline at end of file
+}
diff --git a/subgraph.yaml b/subgraph.yaml
index 563195e..6e52f70 100644
--- a/subgraph.yaml
+++ b/subgraph.yaml
@@ -4,11 +4,11 @@ schema:
 dataSources:
   - kind: ethereum
     name: InstaAutomation
-    network: matic
+    network: avalanche
     source:
       abi: InstaAutomation
-      address: "0x3cF499Dbd2aBB6505f48Db27a9871523A38e6e2C"
-      startBlock: 31471200
+      address: "0x08c1c01be430C9381AD2794412C3E940254CD97c"
+      startBlock: 18160000
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.5
@@ -30,48 +30,18 @@ dataSources:
       eventHandlers:
         - event: LogCancelledAutomation(indexed address,indexed uint32,indexed uint32)
           handler: handleLogCancelAutomation
-        - event: LogSubmittedAutomation(indexed address,indexed uint32,uint128,uint128,uint128)
+        - event: LogSubmittedAutomation(indexed address,indexed
+            uint32,uint128,uint128,uint128)
           handler: handleLogSubmitAutomation
-        - event: LogExecutedAutomationParams(indexed address,indexed uint32,indexed uint32,uint128,uint128,uint16,(address,address,uint256,uint256,uint256,(address,address,uint256,uint256,bytes),uint256,uint256),(string[],bytes[]))
+        - event: LogExecutedAutomationParams(indexed address,indexed uint32,indexed
+            uint32,uint128,uint128,uint16,(address,address,uint256,uint256,uint256,(address,address,uint256,uint256,bytes),uint256,uint256),(string[],bytes[]))
           handler: handleLogExecuteAutomation
-        - event: LogExecutedAutomation(indexed address,indexed uint32,indexed uint32,bool,bytes)
+        - event: LogExecutedAutomation(indexed address,indexed uint32,indexed
+            uint32,bool,bytes)
           handler: handleLogExecuteAutomationMetadata
-        - event: LogSystemCancelledAutomation(indexed address,indexed uint32,indexed uint32,uint8)
+        - event: LogSystemCancelledAutomation(indexed address,indexed uint32,indexed
+            uint32,uint8)
           handler: handleSystemCancelledAutomation
         - event: LogFlippedExecutors(address[],bool[])
           handler: handleExecutors
       file: ./src/insta-automation.ts
-# templates:
-#   - kind: ethereum/contract
-#     name: InstaAutomation
-#     network: matic
-#     source:
-#       abi: InstaAutomation
-#     mapping:
-#       kind: ethereum/events
-#       apiVersion: 0.0.5
-#       language: wasm/assemblyscript
-#       entities:
-#         - Account
-#         - SubmitData
-#         - ExecuteData
-#         - ExecuteMetaData
-#         - CancelData
-#         - SystemCancelData
-#       abis:
-#         - name: InstaAutomation
-#           file: ./abis/InstaAutomation.json
-#       eventHandlers:
-#         - event: LogCancelledAutomation(indexed address,indexed uint32,indexed uint32)
-#           handler: handleLogCancelAutomation
-#         - event: LogSubmittedAutomation(indexed address,indexed uint32,uint128,uint128,uint128)
-#           handler: handleLogSubmitAutomation
-#         - event: LogExecutedAutomationParams(indexed address,indexed uint32,indexed uint32,uint128,uint128,uint16,(address,address,uint256,uint256,uint256,(address,address,uint256,uint256,bytes),uint256,uint256),(string[],bytes[]))
-#           handler: handleLogExecuteAutomation
-#         - event: LogExecutedAutomation(indexed address,indexed uint32,indexed uint32,bool,bytes)
-#           handler: handleLogExecuteAutomationMetadata
-#         - event: LogSystemCancelledAutomation(indexed address,indexed uint32,indexed uint32,uint8)
-#           handler: handleSystemCancelledAutomation
-#         - event: LogFlippedExecutors(address[],bool[])
-#           handler: handleExecutors
-#       file: ./src/insta-automation.ts