diff --git a/packages/v3-watcher/.gitignore b/packages/v3-watcher/.gitignore
index 0b4cc3f..1c88d0a 100644
--- a/packages/v3-watcher/.gitignore
+++ b/packages/v3-watcher/.gitignore
@@ -1,6 +1,7 @@
 node_modules/
 dist/
 out/
+gql-logs/
 
 .vscode
 .idea
diff --git a/packages/v3-watcher/.husky/pre-commit b/packages/v3-watcher/.husky/pre-commit
old mode 100644
new mode 100755
diff --git a/packages/v3-watcher/README.md b/packages/v3-watcher/README.md
index 2a10ac8..b2979b2 100644
--- a/packages/v3-watcher/README.md
+++ b/packages/v3-watcher/README.md
@@ -1,5 +1,9 @@
 # v3-watcher
 
+## Source
+
+* Subgraph: sushiswap-subgraphs v0.1.1-watcher
+
 ## Setup
 
 * Run the following command to install required packages:
diff --git a/packages/v3-watcher/environments/local.toml b/packages/v3-watcher/environments/local.toml
index 9b9b2d7..bab02fc 100644
--- a/packages/v3-watcher/environments/local.toml
+++ b/packages/v3-watcher/environments/local.toml
@@ -70,10 +70,10 @@
     ]
 
     # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
-    rpcClient = false
+    rpcClient = true
 
     # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint
-    isFEVM = false
+    isFEVM = true
 
     # Boolean flag to filter event logs by contracts
     filterLogsByAddresses = true
diff --git a/packages/v3-watcher/subgraph-build/Factory/Factory.wasm b/packages/v3-watcher/subgraph-build/Factory/Factory.wasm
index ae80ef1..8804941 100644
Binary files a/packages/v3-watcher/subgraph-build/Factory/Factory.wasm and b/packages/v3-watcher/subgraph-build/Factory/Factory.wasm differ
diff --git a/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm b/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm
index 47d8567..030c107 100644
Binary files a/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm and b/packages/v3-watcher/subgraph-build/NonfungiblePositionManager/NonfungiblePositionManager.wasm differ
diff --git a/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm b/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm
index 5d5e140..46a279c 100644
Binary files a/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm and b/packages/v3-watcher/subgraph-build/templates/Pool/Pool.wasm differ