diff --git a/codegenerator/cli/CommandLineHelp.md b/codegenerator/cli/CommandLineHelp.md
index be0319377..55e7f6c79 100644
--- a/codegenerator/cli/CommandLineHelp.md
+++ b/codegenerator/cli/CommandLineHelp.md
@@ -71,7 +71,7 @@ Initialize an indexer with one of the initialization options
 * `-n`, `--name <NAME>` — The name of your project
 * `-l`, `--language <LANGUAGE>` — The language used to write handlers
 
-  Possible values: `javascript`, `typescript`, `rescript`
+  Possible values: `typescript`
 
 * `--api-token <API_TOKEN>` — The hypersync API key to be initialized in your templates .env file
 
@@ -142,7 +142,7 @@ Initialize Evm indexer from an example template
 
 * `-t`, `--template <TEMPLATE>` — Name of the template to be used in initialization
 
-  Possible values: `greeter`, `erc20`
+  Possible values: `greeter`, `erc20`, `topic-filtering`, `wildcard-indexing`, `on-block-handler`, `effects-api`, `factory-indexer`, `multichain-indexer`
 
 
 
diff --git a/codegenerator/cli/src/cli_args/init_config.rs b/codegenerator/cli/src/cli_args/init_config.rs
index 4f47cc711..a990d3fdb 100644
--- a/codegenerator/cli/src/cli_args/init_config.rs
+++ b/codegenerator/cli/src/cli_args/init_config.rs
@@ -28,8 +28,22 @@ pub mod evm {
 
     #[derive(Clone, Debug, ValueEnum, Serialize, Deserialize, EnumIter, EnumString, Display)]
     pub enum Template {
+        #[strum(serialize = "Greeter")]
         Greeter,
+        #[strum(serialize = "ERC20")]
         Erc20,
+        #[strum(serialize = "Feature: Topic Filtering")]
+        TopicFiltering,
+        #[strum(serialize = "Feature: Wildcard Indexing")]
+        WildcardIndexing,
+        #[strum(serialize = "Feature: onBlock Handler")]
+        OnBlockHandler,
+        #[strum(serialize = "Feature: Effects API")]
+        EffectsAPI,
+        #[strum(serialize = "Feature: Factory Indexer")]
+        FactoryIndexer,
+        #[strum(serialize = "Feature: Multichain Indexer")]
+        MultichainIndexer,
     }
 
     ///A an object that holds all the values a user can select during
@@ -335,21 +349,15 @@ impl Ecosystem {
 )]
 ///Which language do you want to write in?
 pub enum Language {
-    #[clap(name = "javascript")]
-    JavaScript,
     #[clap(name = "typescript")]
     TypeScript,
-    #[clap(name = "rescript")]
-    ReScript,
 }
 
 impl Language {
     // Logic to get the event handler directory based on the language
     pub fn get_event_handler_directory(&self) -> String {
         match self {
-            Language::ReScript => "./src/EventHandlers.res.js".to_string(),
             Language::TypeScript => "src/EventHandlers.ts".to_string(),
-            Language::JavaScript => "./src/EventHandlers.js".to_string(),
         }
     }
 }
diff --git a/codegenerator/cli/src/cli_args/interactive_init/mod.rs b/codegenerator/cli/src/cli_args/interactive_init/mod.rs
index c758c6f77..9acf36b42 100644
--- a/codegenerator/cli/src/cli_args/interactive_init/mod.rs
+++ b/codegenerator/cli/src/cli_args/interactive_init/mod.rs
@@ -16,7 +16,6 @@ use crate::{
 use anyhow::{Context, Result};
 use inquire::{Select, Text};
 use shared_prompts::prompt_template;
-use std::str::FromStr;
 use strum;
 use strum::{Display, EnumIter, IntoEnumIterator};
 use validation::{
@@ -30,7 +29,9 @@ enum EcosystemOption {
     Fuel,
 }
 
-async fn prompt_ecosystem(cli_init_flow: Option<InitFlow>) -> Result<Ecosystem> {
+async fn prompt_ecosystem(
+    cli_init_flow: Option<InitFlow>,
+) -> Result<Ecosystem> {
     let init_flow = match cli_init_flow {
         Some(v) => v,
         None => {
@@ -138,22 +139,7 @@ pub async fn prompt_missing_init_args(
         }
     };
 
-    let language = match init_args.language {
-        Some(args_language) => args_language,
-        None => {
-            let options = Language::iter()
-                .map(|language| language.to_string())
-                .collect::<Vec<String>>();
-
-            let input_language = Select::new("Which language would you like to use?", options)
-                .with_starting_cursor(1)
-                .prompt()
-                .context("prompting user to select language")?;
-
-            Language::from_str(&input_language)
-                .context("parsing user input for language selection")?
-        }
-    };
+    let language = Language::TypeScript;
 
     let ecosystem = prompt_ecosystem(init_args.init_commands)
         .await
diff --git a/codegenerator/cli/src/config_parsing/graph_migration/mod.rs b/codegenerator/cli/src/config_parsing/graph_migration/mod.rs
index 2f7f16bda..c4b67fbbe 100644
--- a/codegenerator/cli/src/config_parsing/graph_migration/mod.rs
+++ b/codegenerator/cli/src/config_parsing/graph_migration/mod.rs
@@ -114,9 +114,7 @@ pub struct BlockHandler {
 // Logic to get the event handler directory based on the language
 fn get_event_handler_directory(language: &Language) -> String {
     match language {
-        Language::ReScript => "./src/EventHandlers.res.js".to_string(),
         Language::TypeScript => "src/EventHandlers.ts".to_string(),
-        Language::JavaScript => "./src/EventHandlers.js".to_string(),
     }
 }
 
@@ -462,7 +460,7 @@ mod test {
         let temp_dir = TempDir::new("temp_graph_migration_folder").unwrap();
         // subgraph ID of USDC on Ethereum mainnet
         let cid: &str = "QmU5V3jy56KnFbxX2uZagvMwocYZASzy1inX828W2XWtTd";
-        let language: Language = Language::ReScript;
+        let language: Language = Language::TypeScript;
         let project_root = PathBuf::from(temp_dir.path());
         super::generate_config_from_subgraph_id(&project_root, cid, &language)
             .await
@@ -552,15 +550,9 @@ mod test {
     // Unit test to check that the correct event handler directory is returned based on the language
     #[test]
     fn test_get_event_handler_directory() {
-        let language_1: Language = Language::ReScript;
-        let language_2: Language = Language::JavaScript;
-        let language_3: Language = Language::TypeScript;
-        let event_handler_directory_1 = super::get_event_handler_directory(&language_1);
-        let event_handler_directory_2 = super::get_event_handler_directory(&language_2);
-        let event_handler_directory_3 = super::get_event_handler_directory(&language_3);
-        assert_eq!(event_handler_directory_1, "./src/EventHandlers.res.js");
-        assert_eq!(event_handler_directory_2, "./src/EventHandlers.js");
-        assert_eq!(event_handler_directory_3, "src/EventHandlers.ts");
+        let language: Language = Language::TypeScript;
+        let event_handler_directory = super::get_event_handler_directory(&language);
+        assert_eq!(event_handler_directory, "src/EventHandlers.ts");
     }
     // Unit test to check that the correct network contract hashmap is generated
     #[tokio::test]
diff --git a/codegenerator/cli/src/executor/init.rs b/codegenerator/cli/src/executor/init.rs
index e4b718184..c595e5c82 100644
--- a/codegenerator/cli/src/executor/init.rs
+++ b/codegenerator/cli/src/executor/init.rs
@@ -1,7 +1,7 @@
 use crate::{
     cli_args::{
         clap_definitions::{InitArgs, ProjectPaths},
-        init_config::{self, Ecosystem, Language},
+        init_config::{self, Ecosystem},
         interactive_init::prompt_missing_init_args,
     },
     commands,
@@ -19,7 +19,7 @@ use crate::{
     template_dirs::TemplateDirs,
     utils::file_system,
 };
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result};
 
 use std::path::PathBuf;
 
@@ -258,13 +258,6 @@ pub async fn run_init_args(init_args: InitArgs, project_paths: &ProjectPaths) ->
 
     commands::codegen::run_codegen(&config).await?;
 
-    if init_config.language == Language::ReScript {
-        let res_build_exit = commands::rescript::build(&parsed_project_paths.project_root).await?;
-        if !res_build_exit.success() {
-            return Err(anyhow!("Failed to build rescript"))?;
-        }
-    }
-
     // If the project directory is not the current directory, print a message for user to cd into it
     if parsed_project_paths.project_root != PathBuf::from(".") {
         println!(
diff --git a/codegenerator/cli/src/hbs_templating/contract_import_templates.rs b/codegenerator/cli/src/hbs_templating/contract_import_templates.rs
index d20c0ddfe..2aed89e2b 100644
--- a/codegenerator/cli/src/hbs_templating/contract_import_templates.rs
+++ b/codegenerator/cli/src/hbs_templating/contract_import_templates.rs
@@ -253,8 +253,7 @@ impl Event {
     /// Returns the code to get the entity id from an event
     pub fn get_entity_id_code(is_fuel: bool, language: &Language) -> String {
         let int_as_string = |int_var_name| match language {
-            Language::ReScript => format!("{int_var_name}->Belt.Int.toString"),
-            Language::TypeScript | Language::JavaScript => int_var_name,
+            Language::TypeScript => int_var_name,
         };
         let int_event_prop_as_string =
             |event_prop: &str| int_as_string(format!("event.{event_prop}"));
@@ -281,9 +280,7 @@ impl Event {
         match is_fuel {
             true => {
                 let data_code = match language {
-                    Language::ReScript => "%raw(`{}`)",
                     Language::TypeScript => "{}",
-                    Language::JavaScript => "{}",
                 };
                 format!(
                     "{event_module}.mock({{data: {data_code} /* It mocks event fields with \
@@ -566,12 +563,6 @@ mod test {
     #[test]
     fn test_get_entity_id_code() {
         const IS_FUEL: bool = true;
-        assert_eq!(
-            Event::get_entity_id_code(!IS_FUEL, &Language::ReScript),
-            "`${event.chainId->Belt.Int.toString}_${event.block.number->Belt.Int.\
-             toString}_${event.logIndex->Belt.Int.toString}`"
-                .to_string()
-        );
 
         assert_eq!(
             Event::get_entity_id_code(IS_FUEL, &Language::TypeScript),
diff --git a/codegenerator/cli/src/hbs_templating/init_templates.rs b/codegenerator/cli/src/hbs_templating/init_templates.rs
index 285c742ef..56e64bcca 100644
--- a/codegenerator/cli/src/hbs_templating/init_templates.rs
+++ b/codegenerator/cli/src/hbs_templating/init_templates.rs
@@ -10,9 +10,7 @@ use std::path::PathBuf;
 #[derive(Serialize, Debug, PartialEq)]
 pub struct InitTemplates {
     project_name: String,
-    is_rescript: bool,
     is_typescript: bool,
-    is_javascript: bool,
     envio_version: String,
     //Used for the package.json reference to generated in handlers
     relative_path_from_root_to_generated: String,
@@ -46,9 +44,7 @@ impl InitTemplates {
                 .context("Failed to diff generated from root path")?;
         let template = InitTemplates {
             project_name,
-            is_rescript: lang == &Language::ReScript,
             is_typescript: lang == &Language::TypeScript,
-            is_javascript: lang == &Language::JavaScript,
             envio_version,
             relative_path_from_root_to_generated,
             envio_api_token,
@@ -67,7 +63,7 @@ mod test {
     fn test_new_init_template() {
         let init_temp = InitTemplates::new(
             "my-project".to_string(),
-            &Language::ReScript,
+            &Language::TypeScript,
             &ParsedProjectPaths::default(),
             "latest".to_string(),
             None,
@@ -76,9 +72,7 @@ mod test {
 
         let expected = InitTemplates {
             project_name: "my-project".to_string(),
-            is_rescript: true,
-            is_typescript: false,
-            is_javascript: false,
+            is_typescript: true,
             envio_version: "latest".to_string(),
             relative_path_from_root_to_generated: "./generated".to_string(),
             envio_api_token: None,
diff --git a/codegenerator/cli/src/template_dirs.rs b/codegenerator/cli/src/template_dirs.rs
index 376a41493..c5568c56b 100644
--- a/codegenerator/cli/src/template_dirs.rs
+++ b/codegenerator/cli/src/template_dirs.rs
@@ -10,6 +10,7 @@ use std::{
 
 pub trait Template: Display {
     fn to_dir_name(&self) -> String;
+
 }
 
 impl Template for evm::Template {
@@ -17,6 +18,12 @@ impl Template for evm::Template {
         match self {
             evm::Template::Greeter => "greeter",
             evm::Template::Erc20 => "erc20",
+            evm::Template::TopicFiltering => "topic_filtering",
+            evm::Template::WildcardIndexing => "wildcard_indexing",
+            evm::Template::OnBlockHandler => "onblock_handler",
+            evm::Template::EffectsAPI => "effects_api",
+            evm::Template::FactoryIndexer => "factory_indexer",
+            evm::Template::MultichainIndexer => "multichain_indexer",
         }
         .to_string()
     }
@@ -431,59 +438,88 @@ mod test {
     #[test]
     fn all_init_templates_exist() {
         let template_dirs = TemplateDirs::new();
+        let lang = &Language::TypeScript;
 
+        // EVM templates
         for template in evm::Template::iter() {
-            for lang in Language::iter() {
                 template_dirs
                     .get_template_lang_dir(&template, &lang)
-                    .expect("static lang");
-            }
+                    .expect(&format!(
+                        "Expected static language dir for EVM template {:?} and language {:?}",
+                        template, &lang
+                    ));
+            
+
             template_dirs
                 .get_template_shared_dir(&template)
-                .expect("static templte shared");
+                .expect(&format!(
+                    "Expected shared static dir for EVM template {:?}",
+                    template
+                ));
         }
+
+        // FUEL templates
         for template in fuel::Template::iter() {
-            for lang in Language::iter() {
                 template_dirs
                     .get_template_lang_dir(&template, &lang)
-                    .expect("static lang");
-            }
+                    .expect(&format!(
+                        "Expected static language dir for FUEL template {:?} and language {:?}",
+                        template, &lang
+                    ));
+            
             template_dirs
                 .get_template_shared_dir(&template)
-                .expect("static templte shared");
+                .expect(&format!(
+                    "Expected shared static dir for FUEL template {:?}",
+                    template
+                ));
         }
 
+        // Shared dynamic init template
         template_dirs
             .get_init_template_dynamic_shared()
-            .expect("dynami shared init template");
+            .expect("Expected dynamic shared init template dir to exist");
     }
 
     #[test]
     fn all_init_templates_extract_succesfully() {
         let template_dirs = TemplateDirs::new();
-        let temp_dir =
-            TempDir::new("init_extract_lang_test").expect("Failed creating tempdir init template");
+        let temp_dir = TempDir::new("init_extract_lang_test")
+            .expect("Failed creating tempdir for init template");
+        let lang = &Language::TypeScript;
 
+        // EVM templates
         for template in evm::Template::iter() {
-            for lang in Language::iter() {
                 template_dirs
-                    .get_and_extract_template(&template, &lang, &(PathBuf::from(temp_dir.path())))
-                    .expect("static lang");
-            }
+                    .get_and_extract_template(&template, &lang, &PathBuf::from(temp_dir.path()))
+                    .expect(&format!(
+                        "Failed extracting EVM template {:?} for language {:?}",
+                        template, &lang
+                    ));
+            
         }
+
+        // FUEL templates
         for template in fuel::Template::iter() {
-            for lang in Language::iter() {
                 template_dirs
-                    .get_and_extract_template(&template, &lang, &(PathBuf::from(temp_dir.path())))
-                    .expect("static lang");
-            }
+                    .get_and_extract_template(&template, &lang, &PathBuf::from(temp_dir.path()))
+                    .expect(&format!(
+                        "Failed extracting FUEL template {:?} for language {:?}",
+                        template, &lang
+                    ));
         }
-        let temp_dir =
-            TempDir::new("init_extract_blank_lang_test").expect("Failed creating tempdir blank");
+
+        // Blank template extraction
+        let blank_temp_dir = TempDir::new("init_extract_blank_lang_test")
+            .expect("Failed creating tempdir for blank template");
+
         for lang in Language::iter() {
             template_dirs
-                .get_and_extract_blank_template(&lang, &temp_dir.path().into())
-                .expect("static blank");
+                .get_and_extract_blank_template(&lang, &PathBuf::from(blank_temp_dir.path()))
+                .expect(&format!(
+                    "Failed extracting blank template for language {:?}",
+                    lang
+                ));
         }
     }
 
diff --git a/codegenerator/cli/templates/static/blank_template/rescript/rescript.json b/codegenerator/cli/templates/static/blank_template/rescript/rescript.json
deleted file mode 100644
index 4ce91d4be..000000000
--- a/codegenerator/cli/templates/static/blank_template/rescript/rescript.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "EnvioIndexer",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    },
-    {
-      "dir": "test",
-      "subdirs": true
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "jsx": {
-    "version": 4
-  },
-  "suffix": ".res.js",
-  "bs-dependencies": ["generated", "envio", "rescript-schema"]
-}
diff --git a/codegenerator/cli/templates/static/blank_template/rescript/test/Test.res b/codegenerator/cli/templates/static/blank_template/rescript/test/Test.res
deleted file mode 100644
index 5f23a83c8..000000000
--- a/codegenerator/cli/templates/static/blank_template/rescript/test/Test.res
+++ /dev/null
@@ -1,3 +0,0 @@
-open RescriptMocha
-open Belt
-open TestHelpers
diff --git a/codegenerator/cli/templates/static/effects_api_template/shared/.env.example b/codegenerator/cli/templates/static/effects_api_template/shared/.env.example
new file mode 100644
index 000000000..7d6a1dedc
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/shared/.env.example
@@ -0,0 +1,2 @@
+# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_API_TOKEN="<YOUR-API-TOKEN>"
diff --git a/codegenerator/cli/templates/static/effects_api_template/shared/.gitignore b/codegenerator/cli/templates/static/effects_api_template/shared/.gitignore
new file mode 100644
index 000000000..07b74f471
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/shared/.gitignore
@@ -0,0 +1,35 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/*
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
+node_modules/
+build/
+benchmarks/
+artifacts
+cache
+*.res.js
+*.res.mjs
+generated
+.env
diff --git a/codegenerator/cli/templates/static/effects_api_template/shared/README.md b/codegenerator/cli/templates/static/effects_api_template/shared/README.md
new file mode 100644
index 000000000..cf1375bce
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/shared/README.md
@@ -0,0 +1,93 @@
+# Effects API
+
+_Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all [Envio](https://envio.dev) indexer features_
+
+With HyperIndex, the Effects API allows you to perform external calls from your handlers.
+These calls run in parallel with your handler logic, so they don’t block execution.
+
+You can learn more about the Effects API in the documentation: [https://docs.envio.dev/docs/HyperIndex/effect-api](https://docs.envio.dev/docs/HyperIndex/effect-api)
+
+The following example extends the **factory pattern** example to fetch the **decimal of a token** using an RPC call via **Viem**.
+
+## Create Effect
+
+To create an effect in your handler, use the `experimental_createEffect` function from the `envio` package.
+This function takes **two arguments**: effect options and a handler function.
+
+Effect options:
+
+* `name`: used for debugging and logging
+* `input`: the input type of the effect
+* `output`: the output type of the effect
+* `cache`: whether to cache the effect result in the database
+
+## Using Effect
+
+To use the effect, use `context.effect` from your handlers, loaders, or other effects:
+
+```ts
+CONTRACT.EVENT.handler(async ({ event, context }) => {
+  const effectOutput = await context.effect(YOUR_EFFECT, EFFECT_INPUTS);
+});
+```
+
+## `getTokenDetails` Effect
+
+The following effect fetches the **decimal of a token** using an RPC call:
+
+```ts
+const client = createPublicClient({
+  chain: mainnet,
+  transport: http(process.env.ETHEREUM_MAINNET_RPC!),
+});
+
+const ERC20_ABI = parseAbi(["function decimals() view returns (uint8)"]);
+
+const fetchTokenDetails = experimental_createEffect(
+  {
+    name: "fetchTokenDetails",
+    input: {
+      token: S.string,
+    },
+    output: {
+      decimal: S.number,
+    },
+  },
+  async ({ input }) => {
+    const decimals = await client.readContract({
+      address: input.token as `0x${string}`,
+      abi: ERC20_ABI,
+      functionName: "decimals",
+    });
+
+    console.log(`Token decimals: ${decimals}`);
+    return { decimal: decimals };
+  }
+);
+```
+
+## Prerequisites
+
+Before running the indexer locally, make sure you have the following installed:
+
+-   **[Node.js 18+](https://nodejs.org/en/download/)**
+-   **[pnpm](https://pnpm.io/installation)**
+-   **[Docker Desktop](https://www.docker.com/products/docker-desktop/)**
+
+## Running the Indexer
+
+Add your Envio API key to the .env file, then start the indexer:
+
+```bash
+pnpm dev
+```
+
+If you make changes to `config.yaml` or `schema.graphql`, regenerate the type files:
+
+```bash
+pnpm codegen
+```
+
+## GraphQL Playground
+
+While indexer is running, visit the Envio Console([https://envio.dev/console](https://envio.dev/console)) to open the GraphQL Playground and query your indexed data.
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/effects_api_template/shared/schema.graphql b/codegenerator/cli/templates/static/effects_api_template/shared/schema.graphql
new file mode 100644
index 000000000..2b35e0dbb
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/shared/schema.graphql
@@ -0,0 +1,18 @@
+type UniswapV3Factory_PoolCreated {
+    id: ID!
+    token0: String!
+    token0Decimals: Int!
+    token1: String!
+    token1Decimals: Int!
+    fee: BigInt!
+    tickSpacing: BigInt!
+    pool: String!
+}
+
+type UniswapV3Pool_Initialize {
+    id: ID!
+    sqrtPriceX96: BigInt!
+    tick: BigInt!
+    pool: String!
+    poolDetails: [UniswapV3Factory_PoolCreated!]! @derivedFrom(field: "id")
+}
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/effects_api_template/typescript/config.yaml b/codegenerator/cli/templates/static/effects_api_template/typescript/config.yaml
new file mode 100644
index 000000000..8a736252d
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/typescript/config.yaml
@@ -0,0 +1,23 @@
+# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
+name: factory-pattern
+description: Example indexer for indexing factory-deployed contracts
+contracts:
+    - name: UniswapV3Factory
+      handler: src/EventHandlers.ts
+      events:
+          - event: PoolCreated(address indexed token0, address indexed token1, uint24 indexed fee, int24 tickSpacing, address pool)
+    - name: UniswapV3Pool
+      handler: src/EventHandlers.ts
+      events:
+          - event: Swap(address indexed sender, address indexed recipient, int256 amount0, int256 amount1, uint160 sqrtPriceX96, uint128 liquidity, int24 tick)
+
+networks:
+    - id: 1
+      start_block: 0
+      contracts:
+          - name: UniswapV3Factory
+            address:
+                - 0x1F98431c8aD98523631AE4a59f267346ea31F984
+          - name: UniswapV3Pool
+unordered_multichain_mode: true
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/effects_api_template/typescript/src/EventHandlers.ts b/codegenerator/cli/templates/static/effects_api_template/typescript/src/EventHandlers.ts
new file mode 100644
index 000000000..fed6eaa30
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/typescript/src/EventHandlers.ts
@@ -0,0 +1,72 @@
+import { experimental_createEffect, S } from "envio";
+import { UniswapV3Factory, UniswapV3Pool } from "generated";
+import { createPublicClient, http, parseAbi } from "viem";
+import { mainnet } from "viem/chains";
+
+const client = createPublicClient({
+  chain: mainnet,
+  transport: http(process.env.ETHEREUM_MAINNET_RPC!),
+});
+
+const ERC20_ABI = parseAbi(["function decimals() view returns (uint8)"]);
+
+const fetchTokenDetails = experimental_createEffect(
+  {
+    name: "fetchTokenDetails",
+    input: {
+      token: S.string,
+    },
+    output: {
+      decimal: S.number,
+    },
+  },
+  async ({ input }) => {
+    const decimals = await client.readContract({
+      address: input.token as `0x${string}`,
+      abi: ERC20_ABI,
+      functionName: "decimals",
+    });
+
+    console.log(`Token decimals: ${decimals}`);
+    return { decimal: decimals };
+  },
+);
+
+UniswapV3Factory.PoolCreated.handler(async ({ event, context }) => {
+  const token0Details = await context.effect(fetchTokenDetails, {
+    token: event.params.token0,
+  });
+
+  const token1Details = await context.effect(fetchTokenDetails, {
+    token: event.params.token1,
+  });
+
+  const entity = {
+    id: `${event.chainId}_${event.params.pool}`,
+    token0: event.params.token0,
+    token0Decimals: token0Details.decimal,
+    token1: event.params.token1,
+    token1Decimals: token1Details.decimal,
+    fee: event.params.fee,
+    tickSpacing: event.params.tickSpacing,
+    pool: event.params.pool,
+  };
+
+  context.UniswapV3Factory_PoolCreated.set(entity);
+});
+
+UniswapV3Factory.PoolCreated.contractRegister(({ event, context }) => {
+  context.addUniswapV3Pool(event.params.pool);
+});
+
+UniswapV3Pool.Initialize.handler(async ({ event, context }) => {
+  const entity = {
+    id: `${event.chainId}_${event.srcAddress}`,
+    sqrtPriceX96: event.params.sqrtPriceX96,
+    tick: event.params.tick,
+    pool: event.srcAddress,
+    poolDetails: `${event.chainId}_${event.srcAddress}`,
+  };
+
+  context.UniswapV3Pool_Initialize.set(entity);
+});
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/blank_template/javascript/.gitkeep b/codegenerator/cli/templates/static/effects_api_template/typescript/test/test.ts
similarity index 100%
rename from codegenerator/cli/templates/static/blank_template/javascript/.gitkeep
rename to codegenerator/cli/templates/static/effects_api_template/typescript/test/test.ts
diff --git a/codegenerator/cli/templates/static/effects_api_template/typescript/tsconfig.json b/codegenerator/cli/templates/static/effects_api_template/typescript/tsconfig.json
new file mode 100644
index 000000000..230241339
--- /dev/null
+++ b/codegenerator/cli/templates/static/effects_api_template/typescript/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020", //required for use with BigInt types
+    "lib": [
+      "es2020"
+    ],
+    "allowJs": true,
+    "checkJs": false,
+    "outDir": "build",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}
diff --git a/codegenerator/cli/templates/static/erc20_template/javascript/config.yaml b/codegenerator/cli/templates/static/erc20_template/javascript/config.yaml
deleted file mode 100644
index 4f901c69f..000000000
--- a/codegenerator/cli/templates/static/erc20_template/javascript/config.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
-name: erc20indexer
-description: ERC-20 indexer
-networks:
-  - id: 1 # Ethereum Mainnet
-    start_block: 10861674
-    contracts:
-      - name: ERC20
-        address: "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984" #UNI
-        handler: src/EventHandlers.js
-        events:
-          - event: "Approval(address indexed owner, address indexed spender, uint256 value)"
-          - event: "Transfer(address indexed from, address indexed to, uint256 value)"
-# Unordered multichain mode allows you to index events from multiple chains
-# in realtime but doesn't guarentee ordering between chains
-# https://docs.envio.dev/docs/HyperIndex/multichain-indexing#unordered-multichain-mode
-unordered_multichain_mode: true
-# Preload optimisation makes your indexer much faster.
-# But be aware that your handlers will run twice,
-# so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/erc20_template/javascript/src/EventHandlers.js b/codegenerator/cli/templates/static/erc20_template/javascript/src/EventHandlers.js
deleted file mode 100644
index eda2849f9..000000000
--- a/codegenerator/cli/templates/static/erc20_template/javascript/src/EventHandlers.js
+++ /dev/null
@@ -1,72 +0,0 @@
-const { ERC20 } = require("generated");
-
-ERC20.Approval.handler(async ({ event, context }) => {
-  //  getting the owner Account entity
-  const ownerAccount = await context.Account.get(event.params.owner);
-
-  if (ownerAccount === undefined) {
-    // It's possible to call the approve function without having a balance of the token and hence the account doesn't exist yet
-
-    // create the account
-    const accountObject = {
-      id: event.params.owner,
-      balance: BigInt(0),
-    };
-
-    context.Account.set(accountObject);
-  }
-  const approvalId = event.params.owner + "-" + event.params.spender;
-
-  const approvalObject = {
-    id: approvalId,
-    amount: event.params.value,
-    owner_id: event.params.owner,
-    spender_id: event.params.spender,
-  };
-
-  // this is the same for create or update as the amount is overwritten
-  context.Approval.set(approvalObject);
-});
-
-ERC20.Transfer.handler(async ({ event, context }) => {
-  const senderAccount = await context.Account.get(event.params.from);
-
-  if (senderAccount === undefined) {
-    // create the account
-    // This is likely only ever going to be the zero address in the case of the first mint
-    const accountObject = {
-      id: event.params.from,
-      balance: BigInt(0) - event.params.value,
-    };
-
-    context.Account.set(accountObject);
-  } else {
-    // subtract the balance from the existing users balance
-    const accountObject = {
-      id: senderAccount.id,
-      balance: senderAccount.balance - event.params.value,
-    };
-    context.Account.set(accountObject);
-  }
-
-  // getting the sender Account entity
-  const receiverAccount = await context.Account.get(event.params.to);
-
-  if (receiverAccount === undefined) {
-    // create new account
-    const accountObject = {
-      id: event.params.to,
-      balance: event.params.value,
-    };
-
-    context.Account.set(accountObject);
-  } else {
-    // update existing account
-    const accountObject = {
-      id: receiverAccount.id,
-      balance: receiverAccount.balance + event.params.value,
-    };
-
-    context.Account.set(accountObject);
-  }
-});
diff --git a/codegenerator/cli/templates/static/erc20_template/javascript/test/test.js b/codegenerator/cli/templates/static/erc20_template/javascript/test/test.js
deleted file mode 100644
index d6806f513..000000000
--- a/codegenerator/cli/templates/static/erc20_template/javascript/test/test.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const assert = require("assert");
-const { TestHelpers } = require("generated");
-const { MockDb, ERC20, Addresses } = TestHelpers;
-
-describe("Transfers", () => {
-  it("Transfer subtracts the from account balance and adds to the to account balance", async () => {
-    //Instantiate a mock DB
-    const mockDbEmpty = MockDb.createMockDb();
-
-    //Get mock addresses from helpers
-    const userAddress1 = Addresses.mockAddresses[0];
-    const userAddress2 = Addresses.mockAddresses[1];
-
-    //Make a mock entity to set the initial state of the mock db
-    const mockAccountEntity = {
-      id: userAddress1,
-      balance: 5n,
-    };
-
-    //Set an initial state for the user
-    //Note: set and delete functions do not mutate the mockDb, they return a new
-    //mockDb with with modified state
-    const mockDb = mockDbEmpty.entities.Account.set(mockAccountEntity);
-
-    //Create a mock Transfer event from userAddress1 to userAddress2
-    const mockTransfer = ERC20.Transfer.createMockEvent({
-      from: userAddress1,
-      to: userAddress2,
-      value: 3n,
-    });
-
-    //Process the mockEvent
-    //This takes in the mockDb and returns a new updated mockDb.
-    //The initial mockDb is not mutated with processEvent
-    const mockDbAfterTransfer = await ERC20.Transfer.processEvent({
-      event: mockTransfer,
-      mockDb,
-    });
-
-    //Get the balance of userAddress1 after the transfer
-    const account1Balance =
-      mockDbAfterTransfer.entities.Account.get(userAddress1)?.balance;
-
-    //Assert the expected balance
-    assert.equal(
-      2n,
-      account1Balance,
-      "Should have subtracted transfer amount 3 from userAddress1 balance 5",
-    );
-
-    //Get the balance of userAddress2 after the transfer
-    const account2Balance =
-      mockDbAfterTransfer.entities.Account.get(userAddress2)?.balance;
-
-    //Assert the expected balance
-    assert.equal(
-      3n,
-      account2Balance,
-      "Should have added transfer amount 3 to userAddress2 balance 0",
-    );
-  });
-});
diff --git a/codegenerator/cli/templates/static/erc20_template/rescript/config.yaml b/codegenerator/cli/templates/static/erc20_template/rescript/config.yaml
deleted file mode 100644
index 291f2845f..000000000
--- a/codegenerator/cli/templates/static/erc20_template/rescript/config.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
-name: erc20indexer
-description: ERC-20 indexer
-networks:
-  - id: 1 # Ethereum Mainnet
-    start_block: 10861674
-    contracts:
-      - name: ERC20
-        address: "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984" #UNI
-        handler: src/EventHandlers.res.js
-        events:
-          - event: "Approval(address indexed owner, address indexed spender, uint256 value)"
-          - event: "Transfer(address indexed from, address indexed to, uint256 value)"
-# Unordered multichain mode allows you to index events from multiple chains
-# in realtime but doesn't guarentee ordering between chains
-# https://docs.envio.dev/docs/HyperIndex/multichain-indexing#unordered-multichain-mode
-unordered_multichain_mode: true
-# Preload optimisation makes your indexer much faster.
-# But be aware that your handlers will run twice,
-# so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/erc20_template/rescript/rescript.json b/codegenerator/cli/templates/static/erc20_template/rescript/rescript.json
deleted file mode 100644
index f53814122..000000000
--- a/codegenerator/cli/templates/static/erc20_template/rescript/rescript.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "erc20",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    },
-    {
-      "dir": "test",
-      "subdirs": true
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "jsx": {
-    "version": 4
-  },
-  "suffix": ".res.js",
-  "bs-dependencies": ["generated", "envio", "rescript-schema"]
-}
diff --git a/codegenerator/cli/templates/static/erc20_template/rescript/src/EventHandlers.bs.js b/codegenerator/cli/templates/static/erc20_template/rescript/src/EventHandlers.bs.js
deleted file mode 100644
index 1316771c7..000000000
--- a/codegenerator/cli/templates/static/erc20_template/rescript/src/EventHandlers.bs.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// NOTE: this file will be over-written by the rescript compiler.
-// This is merely a template file, and isn't needed if the codegeneration step is working.
diff --git a/codegenerator/cli/templates/static/erc20_template/rescript/src/EventHandlers.res b/codegenerator/cli/templates/static/erc20_template/rescript/src/EventHandlers.res
deleted file mode 100644
index 0db3cd585..000000000
--- a/codegenerator/cli/templates/static/erc20_template/rescript/src/EventHandlers.res
+++ /dev/null
@@ -1,82 +0,0 @@
-open Types
-
-Handlers.ERC20.Approval.handler(async ({event, context}) => {
-  let ownerAccount = await context.account.get(event.params.owner->Address.toString)
-
-  if(ownerAccount->Belt.Option.isNone)
-  {
-    // setting Entities.Account.t object
-    let accountObject: Entities.Account.t = {
-      id: event.params.owner->Address.toString,
-      balance: BigInt.fromInt(0),
-    }
-
-    // setting the account-entity with the new transfer field value
-    context.account.set(accountObject)
-  }
-
-  let approvalId =
-    event.params.owner->Address.toString ++ "-" ++ event.params.spender->Address.toString;
-
-  let approvalObject: Entities.Approval.t = {
-    id: approvalId,
-    amount: event.params.value,
-    owner_id: event.params.owner->Address.toString,
-    spender_id: event.params.spender->Address.toString,
-  };
-
-  // this is the same for create or update as the amount is overwritten
-  context.approval.set(approvalObject);
-  
-})
-
-Handlers.ERC20.Transfer.handler(async ({event, context}) => {
-  let senderAccount = await context.account.get(event.params.from->Address.toString)
-
-  switch senderAccount {
-  | Some(existingSenderAccount) => {
-      // subtract the balance from the existing users balance
-      let accountObject: Entities.Account.t = {
-        id: existingSenderAccount.id,        
-        balance: existingSenderAccount.balance->BigInt.sub(event.params.value),
-      }
-      context.account.set(accountObject)
-    }
-
-  | None => {
-      // create the account
-      // This is likely only ever going to be the zero address in the case of the first mint
-      let accountObject: Entities.Account.t = {
-        id: event.params.from->Address.toString,
-        balance: BigInt.fromInt(0)->BigInt.sub(event.params.value),
-      }
-
-      // setting the account-entity with the new transfer field value
-      context.account.set(accountObject)
-    }
-  }
-
-  let receiverAccount = await context.account.get(event.params.to->Address.toString)
-
-  switch receiverAccount {
-  | Some(existingReceiverAccount) => {
-      // update existing account's added balance
-      let accountObject: Entities.Account.t = {
-        id: existingReceiverAccount.id,        
-        balance: existingReceiverAccount.balance->BigInt.add(event.params.value),
-      }
-
-      context.account.set(accountObject)
-    }
-
-  | None => {
-      // create new account
-      let accountObject: Entities.Account.t = {
-        id: event.params.to->Address.toString,            
-        balance: event.params.value,
-      }
-
-      context.account.set(accountObject)
-    }
-  }
-})
diff --git a/codegenerator/cli/templates/static/erc20_template/rescript/test/Test.res b/codegenerator/cli/templates/static/erc20_template/rescript/test/Test.res
deleted file mode 100644
index b4ce8201c..000000000
--- a/codegenerator/cli/templates/static/erc20_template/rescript/test/Test.res
+++ /dev/null
@@ -1,68 +0,0 @@
-open RescriptMocha
-open Belt
-open TestHelpers
-
-describe("Transfers", () => {
-  Async.it(
-    "Transfer subtracts the from account balance and adds to the to account balance",
-    async () => {
-      //Instantiate a mock DB
-      let mockDbEmpty = MockDb.createMockDb()
-
-      //Get mock addresses from helpers
-      let userAddress1 = Ethers.Addresses.mockAddresses[0]->Option.getUnsafe
-      let userAddress2 = Ethers.Addresses.mockAddresses[1]->Option.getUnsafe
-
-      //Make a mock entity to set the initial state of the mock db
-      let mockAccountEntity: Entities.Account.t = {
-        id: userAddress1->Address.toString,
-        balance: BigInt.fromInt(5),
-      }
-
-      //Set an initial state for the user
-      //Note: set and delete functions do not mutate the mockDb, they return a new
-      //mockDb with with modified state
-      let mockDb = mockDbEmpty.entities.account.set(mockAccountEntity)
-
-      //Create a mock Transfer event from userAddress1 to userAddress2
-      let mockTransfer = ERC20.Transfer.createMockEvent({
-        from: userAddress1,
-        to: userAddress2,
-        value: BigInt.fromInt(3),
-      })
-
-      //Process the mockEvent
-      //Note: processEvent functions do not mutate the mockDb, they return a new
-      //mockDb with with modified state
-      let mockDbAfterTransfer = await ERC20.Transfer.processEvent({
-        event: mockTransfer,
-        mockDb,
-      })
-
-      //Get the balance of userAddress1 after the transfer
-      let account1Balance =
-        mockDbAfterTransfer.entities.account.get(
-          userAddress1->Address.toString,
-        )->Option.map(a => a.balance)
-
-      //Assert the expected balance
-      Assert.equal(
-        Some(BigInt.fromInt(2)),
-        account1Balance,
-        ~message="Should have subtracted transfer amount 3 from userAddress1 balance 5",
-      )
-
-      //Get the balance of userAddress2 after the transfer
-      let account2Balance =
-        mockDbAfterTransfer.entities.account.get(
-          userAddress2->Address.toString,
-        )->Option.map(a => a.balance)
-      //Assert the expected balance
-      Assert.equal(
-        Some(BigInt.fromInt(3)),
-        account2Balance,
-        ~message="Should have added transfer amount 3 to userAddress2 balance 0",
-      )
-    },
-  )
-})
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/shared/.env.example b/codegenerator/cli/templates/static/factory_indexer_template/shared/.env.example
new file mode 100644
index 000000000..7d6a1dedc
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/shared/.env.example
@@ -0,0 +1,2 @@
+# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_API_TOKEN="<YOUR-API-TOKEN>"
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/shared/.gitignore b/codegenerator/cli/templates/static/factory_indexer_template/shared/.gitignore
new file mode 100644
index 000000000..07b74f471
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/shared/.gitignore
@@ -0,0 +1,35 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/*
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
+node_modules/
+build/
+benchmarks/
+artifacts
+cache
+*.res.js
+*.res.mjs
+generated
+.env
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/shared/README.md b/codegenerator/cli/templates/static/factory_indexer_template/shared/README.md
new file mode 100644
index 000000000..e2ee65527
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/shared/README.md
@@ -0,0 +1,55 @@
+# Factory Indexer
+
+_Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all [Envio](https://envio.dev) indexer features_
+
+With **HyperIndex**, developers can index contracts **deployed from factory contracts** without specifying their addresses in advance. A common example of the factory pattern is **Uniswap V3**, which deploys new pool contracts through its factory.
+
+This example demonstrates how to index **Uniswap V3 Pools** created by the **Uniswap V3 Factory** on **Ethereum Mainnet**.
+
+For more information, see the [dynamic contracts documentation](https://docs.envio.dev/docs/HyperIndex/dynamic-contracts).
+
+## Contract Registration
+
+To index contracts deployed from a factory, use the `contractRegister` handler on the event that emits the deployed contract’s address. Within the handler, use the `context` object to register the new contract with the indexer.
+
+Example:
+
+```ts
+<contract-name>.<event-name>.contractRegister(({ event, context }) => {
+  context.add<your-contract-name>(<address-of-the-contract>);
+});
+```
+
+In the case of **Uniswap V3 Factory**, the handler looks like this:
+
+```ts
+UniswapV3Factory.PoolCreated.contractRegister(({ event, context }) => {
+    context.addUniswapV3Pool(event.params.pool);
+});
+```
+
+## Prerequisites
+
+Before running the indexer locally, make sure you have the following installed:
+
+-   **[Node.js 18+](https://nodejs.org/en/download/)**
+-   **[pnpm](https://pnpm.io/installation)**
+-   **[Docker Desktop](https://www.docker.com/products/docker-desktop/)**
+
+## Running the Indexer
+
+Add your Envio API key to the .env file, then start the indexer:
+
+```bash
+pnpm dev
+```
+
+If you make changes to `config.yaml` or `schema.graphql`, regenerate the type files:
+
+```bash
+pnpm codegen
+```
+
+## GraphQL Playground
+
+While indexer is running, visit the Envio Console([https://envio.dev/console](https://envio.dev/console)) to open the GraphQL Playground and query your indexed data.
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/shared/schema.graphql b/codegenerator/cli/templates/static/factory_indexer_template/shared/schema.graphql
new file mode 100644
index 000000000..7990c437e
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/shared/schema.graphql
@@ -0,0 +1,20 @@
+type UniswapV3Factory_PoolCreated {
+    id: ID!
+    token0: String!
+    token1: String!
+    fee: BigInt!
+    tickSpacing: BigInt!
+    pool: String!
+    swaps: [UniswapV3Pool_Swap!]! @derivedFrom(field: "pool")
+}
+
+type UniswapV3Pool_Swap {
+    id: ID!
+    sender: String!
+    recipient: String!
+    amount0: BigInt!
+    amount1: BigInt!
+    sqrtPriceX96: BigInt!
+    liquidity: BigInt!
+    pool: String!
+}
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/typescript/config.yaml b/codegenerator/cli/templates/static/factory_indexer_template/typescript/config.yaml
new file mode 100644
index 000000000..6b8574ed4
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/typescript/config.yaml
@@ -0,0 +1,23 @@
+# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
+name: effects-api
+description: Example indexer showing how to use HyperIndex's Effects API.
+contracts:
+    - name: UniswapV3Factory
+      handler: src/EventHandlers.ts
+      events:
+          - event: PoolCreated(address indexed token0, address indexed token1, uint24 indexed fee, int24 tickSpacing, address pool)
+    - name: UniswapV3Pool
+      handler: src/EventHandlers.ts
+      events:
+          - event: Initialize(uint160 sqrtPriceX96, int24 tick)
+
+networks:
+    - id: 1
+      start_block: 23581204
+      contracts:
+          - name: UniswapV3Factory
+            address:
+                - 0x1F98431c8aD98523631AE4a59f267346ea31F984
+          - name: UniswapV3Pool
+unordered_multichain_mode: true
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/typescript/src/EventHandlers.ts b/codegenerator/cli/templates/static/factory_indexer_template/typescript/src/EventHandlers.ts
new file mode 100644
index 000000000..ea0bc9710
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/typescript/src/EventHandlers.ts
@@ -0,0 +1,36 @@
+/*
+ * Please refer to https://docs.envio.dev for a thorough guide on all Envio indexer features
+ */
+import { UniswapV3Factory, UniswapV3Pool } from "generated";
+
+UniswapV3Factory.PoolCreated.handler(async ({ event, context }) => {
+    const entity = {
+        id: `${event.chainId}_${event.params.pool}`,
+        token0: event.params.token0,
+        token1: event.params.token1,
+        fee: event.params.fee,
+        tickSpacing: event.params.tickSpacing,
+        pool: event.params.pool,
+    };
+
+    context.UniswapV3Factory_PoolCreated.set(entity);
+});
+
+UniswapV3Factory.PoolCreated.contractRegister(({ event, context }) => {
+    context.addUniswapV3Pool(event.params.pool);
+});
+
+UniswapV3Pool.Swap.handler(async ({ event, context }) => {
+    const entity = {
+        id: `${event.chainId}_${event.block.number}_${event.logIndex}`,
+        sqrtPriceX96: event.params.sqrtPriceX96,
+        liquidity: event.params.liquidity,
+        amount0: event.params.amount0,
+        amount1: event.params.amount1,
+        sender: event.params.sender,
+        recipient: event.params.recipient,
+        pool: event.srcAddress,
+    };
+
+    context.UniswapV3Pool_Swap.set(entity);
+});
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/typescript/test/test.ts b/codegenerator/cli/templates/static/factory_indexer_template/typescript/test/test.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/codegenerator/cli/templates/static/factory_indexer_template/typescript/tsconfig.json b/codegenerator/cli/templates/static/factory_indexer_template/typescript/tsconfig.json
new file mode 100644
index 000000000..230241339
--- /dev/null
+++ b/codegenerator/cli/templates/static/factory_indexer_template/typescript/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020", //required for use with BigInt types
+    "lib": [
+      "es2020"
+    ],
+    "allowJs": true,
+    "checkJs": false,
+    "outDir": "build",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}
diff --git a/codegenerator/cli/templates/static/greeter_template/javascript/README.md b/codegenerator/cli/templates/static/greeter_template/javascript/README.md
deleted file mode 100644
index 603c679ac..000000000
--- a/codegenerator/cli/templates/static/greeter_template/javascript/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## Envio Greeter Template
-
-*Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all [Envio](https://envio.dev) indexer features*
-
-### Run
-
-```bash
-pnpm dev
-```
-
-Visit http://localhost:8080 to see the GraphQL Playground, local password is `testing`.
-
-### Generate files from `config.yaml` or `schema.graphql`
-
-```bash
-pnpm codegen
-```
-
-### Pre-requisites
-
-- [Node.js (use v18 or newer)](https://nodejs.org/en/download/current)
-- [pnpm (use v8 or newer)](https://pnpm.io/installation)
-- [Docker desktop](https://www.docker.com/products/docker-desktop/)
diff --git a/codegenerator/cli/templates/static/greeter_template/javascript/config.yaml b/codegenerator/cli/templates/static/greeter_template/javascript/config.yaml
deleted file mode 100644
index d1e1b4f45..000000000
--- a/codegenerator/cli/templates/static/greeter_template/javascript/config.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
-name: Greeter
-description: Greeter indexer
-#Global contract definitions that must contain all definitions except
-#addresses. Now you can share a single handler/abi/event definitions
-#for contracts across multiple chains
-contracts:
-  - name: Greeter
-    abi_file_path: ./abis/greeter-abi.json
-    handler: ./src/EventHandlers.js
-    events:
-      - event: NewGreeting
-      - event: ClearGreeting
-networks:
-  - id: 137 # Polygon
-    start_block: 45336336
-    contracts:
-      - name: Greeter #A reference to the global contract definition
-        address: "0x9D02A17dE4E68545d3a58D3a20BbBE0399E05c9c"
-  - id: 59144 # Linea
-    start_block: 367801
-    contracts:
-      - name: Greeter #A reference to the global contract definition
-        address: "0xdEe21B97AB77a16B4b236F952e586cf8408CF32A"
-# Unordered multichain mode allows you to index events from multiple chains
-# in realtime but doesn't guarentee ordering between chains
-# https://docs.envio.dev/docs/HyperIndex/multichain-indexing#unordered-multichain-mode
-unordered_multichain_mode: true
-# Preload optimisation makes your indexer much faster.
-# But be aware that your handlers will run twice,
-# so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/greeter_template/javascript/src/EventHandlers.js b/codegenerator/cli/templates/static/greeter_template/javascript/src/EventHandlers.js
deleted file mode 100644
index 148b2b1db..000000000
--- a/codegenerator/cli/templates/static/greeter_template/javascript/src/EventHandlers.js
+++ /dev/null
@@ -1,39 +0,0 @@
-const { Greeter } = require("generated");
-
-// Handler for the NewGreeting event
-Greeter.NewGreeting.handler(async ({ event, context }) => {
-  const userId = event.params.user; // The id for the User entity
-  const latestGreeting = event.params.greeting; // The greeting string that was added
-  const currentUserEntity = await context.User.get(userId); // Optional user entity that may already exist
-
-  // Update or create a new User entity
-  const userEntity = currentUserEntity
-    ? {
-      id: userId,
-      latestGreeting,
-      numberOfGreetings: currentUserEntity.numberOfGreetings + 1,
-      greetings: [...currentUserEntity.greetings, latestGreeting],
-    }
-    : {
-      id: userId,
-      latestGreeting,
-      numberOfGreetings: 1,
-      greetings: [latestGreeting],
-    };
-
-  context.User.set(userEntity); // Set the User entity in the DB
-});
-
-// Handler for the ClearGreeting event
-Greeter.ClearGreeting.handler(async ({ event, context }) => {
-  const userId = event.params.user; // The id for the User entity
-  const currentUserEntity = await context.User.get(userId); // Optional user entity that may already exist
-
-  if (currentUserEntity) {
-    context.User.set({
-      ...currentUserEntity,
-      latestGreeting: "", // Clear the latestGreeting
-    });
-  }
-});
-
diff --git a/codegenerator/cli/templates/static/greeter_template/javascript/test/test.js b/codegenerator/cli/templates/static/greeter_template/javascript/test/test.js
deleted file mode 100644
index 3d640bef3..000000000
--- a/codegenerator/cli/templates/static/greeter_template/javascript/test/test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-const assert = require("assert");
-const { TestHelpers } = require("generated");
-const { MockDb, Greeter, Addresses } = TestHelpers;
-
-describe("Greeter template tests", () => {
-  it("A NewGreeting event creates a User entity", async () => {
-    // Initializing the mock database
-    const mockDbInitial = MockDb.createMockDb();
-
-    // Initializing values for mock event
-    const userAddress = Addresses.defaultAddress;
-    const greeting = "Hi there";
-
-    // Creating a mock event
-    const mockNewGreetingEvent = Greeter.NewGreeting.createMockEvent({
-      greeting: greeting,
-      user: userAddress,
-    });
-
-    // Processing the mock event on the mock database
-    const updatedMockDb = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    });
-
-    // Expected entity that should be created
-    const expectedUserEntity = {
-      id: userAddress,
-      latestGreeting: greeting,
-      numberOfGreetings: 1,
-      greetings: [greeting],
-    };
-
-    // Getting the entity from the mock database
-    const actualUserEntity = updatedMockDb.entities.User.get(userAddress);
-
-    // Asserting that the entity in the mock database is the same as the expected entity
-    assert.deepEqual(expectedUserEntity, actualUserEntity);
-  });
-
-  it("2 Greetings from the same users results in that user having a greeter count of 2", async () => {
-    // Initializing the mock database
-    const mockDbInitial = MockDb.createMockDb();
-    // Initializing values for mock event
-    const userAddress = Addresses.defaultAddress;
-    const greeting = "Hi there";
-    const greetingAgain = "Oh hello again";
-
-    // Creating a mock event
-    const mockNewGreetingEvent = Greeter.NewGreeting.createMockEvent({
-      greeting: greeting,
-      user: userAddress,
-    });
-
-    // Creating a mock event
-    const mockNewGreetingEvent2 = Greeter.NewGreeting.createMockEvent({
-      greeting: greetingAgain,
-      user: userAddress,
-    });
-
-    // Processing the mock event on the mock database
-    const updatedMockDb = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    });
-
-    // Processing the mock event on the updated mock database
-    const updatedMockDb2 = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent2,
-      mockDb: updatedMockDb,
-    });
-
-    // Getting the entity from the mock database
-    const actualUserEntity = updatedMockDb2.entities.User.get(userAddress);
-
-    // Asserting that the field value of the entity in the mock database is the same as the expected field value
-    assert.equal(2, actualUserEntity?.numberOfGreetings);
-  });
-
-  it("2 Greetings from the same users results in the latest greeting being the greeting from the second event", async () => {
-    // Initializing the mock database
-    const mockDbInitial = MockDb.createMockDb();
-    // Initializing values for mock event
-    const userAddress = Addresses.defaultAddress;
-    const greeting = "Hi there";
-    const greetingAgain = "Oh hello again";
-
-    // Creating a mock event
-    const mockNewGreetingEvent = Greeter.NewGreeting.createMockEvent({
-      greeting: greeting,
-      user: userAddress,
-    });
-
-    // Creating a mock event
-    const mockNewGreetingEvent2 = Greeter.NewGreeting.createMockEvent({
-      greeting: greetingAgain,
-      user: userAddress,
-    });
-
-    // Processing the mock event on the mock database
-    const updatedMockDb = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    });
-
-    // Processing the mock event on the updated mock database
-    const updatedMockDb2 = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent2,
-      mockDb: updatedMockDb,
-    });
-
-    // Getting the entity from the mock database
-    const actualUserEntity = updatedMockDb2.entities.User.get(userAddress);
-
-    const expectedGreeting = greetingAgain;
-
-    // Asserting that the field value of the entity in the mock database is the same as the expected field value
-    assert.equal(expectedGreeting, actualUserEntity?.latestGreeting);
-  });
-});
diff --git a/codegenerator/cli/templates/static/greeter_template/rescript/README.md b/codegenerator/cli/templates/static/greeter_template/rescript/README.md
deleted file mode 100644
index f904afe0c..000000000
--- a/codegenerator/cli/templates/static/greeter_template/rescript/README.md
+++ /dev/null
@@ -1,151 +0,0 @@
-## Indexer Requirements
-
-The following files are required to use the Indexer:
-
-- Configuration (defaults to `config.yaml`)
-- GraphQL Schema (defaults to `schema.graphql`)
-- Event Handlers (defaults to `src/EventHandlers.res`)
-
-These files are auto-generated according to the Greeter template by running `envio init` command.
-
-## Config File Setup
-
-Example config file from Greeter scenario:
-
-```yaml
-name: greeter_indexer
-description: Greeter indexer
-networks:
-  - id: 1337
-    rpc_config:
-      url: http://localhost:8545
-    start_block: 0
-    contracts:
-      - name: Greeter
-        abi_file_path: abis/greeter-abi.json
-        address: ["0x2B502ab6F783c2Ae96A75dc68cf82a77ce2637c2"]
-        handler: ./src/EventHandlers.res.js
-        events:
-          - name: "NewGreeting"
-          - name: "ClearGreeting"
-```
-
-**Field Descriptions**
-
-- `version` - Version of the config schema used by the indexer
-- `description` - Description of the project
-- `networks` - Configuration of the blockchain networks that the project is deployed on
-  - `id` - Chain identifier of the network
-- `rpc_config` - RPC Config that will be used to subscribe to blockchain data on this network
-  - `url` - URL of the RPC endpoint
-  - `start_block` - Initial block from which the indexer will start listening for events
-  - `contracts` - Configuration for each contract deployed on the network
-    - `name` - User-defined contract name
-    - `abi_file_path` - File location of the contract ABI
-    - `address` - An array of addresses that the contract is deployed to on the network
-    - `handler` - Location of the file that handles the events emitted by this contract
-    - `events` - Configuration for each event emitted by this contract that the indexer will listen for
-      - `name` - Name of the event (must match the name in the ABI)
-      - `required_entities` - An array of entities that need to loaded and made accessible within the handler function (an empty array indicates that no entities are required)
-        - `name` - The name of the required entity (must match an entity defined in `schema.graphql`)
-        - `label` - A user defined label that corresponds to this entity load
-
-### Schema Definition
-
-The `schema.graphql` file contains the definitions of all user-defined entities. These entity types are then created/modified within the handler files.
-
-Example schema definition for Greeter scenario:
-
-```graphql
-type Greeting @entity {
-  id: ID!
-  latestGreeting: String!
-  numberOfGreetings: Int!
-}
-```
-
-## Writing Event Handlers
-
-Once the configuration and graphQL schema files are in place, run
-
-```bash
-envio codegen
-```
-
-in the project directory.
-
-The entity and event types will then be available in the handler files.
-
-A user can specify a specific handler file per contract that processes events emitted by that contract.
-Each event handler requires two functions to be registered in order to enable full functionality within the indexer.
-
-1. An `<event>LoadEntities` function
-2. An `<event>Handler` function
-
-### Example of registering a `loadEntities` function for the `NewGreeting` event from the above example config:
-
-```rescript
-Handlers.Greeter.registerNewGreetingLoadEntities((~event, ~context) => {
-  context.greeting.greetingWithChangesLoad(event.params.user->Address.toString)
-})
-```
-
-Inspecting the config of the `NewGreeting` event from the above example config indicates that there is a defined `requiredEntities` field of the following:
-
-```yaml
-events:
-  - name: "NewGreeting"
-    requiredEntities:
-      - name: "Greeting"
-        labels:
-          - "greetingWithChanges"
-```
-
-- The register function `registerNewGreetingLoadEntities` follows a naming convention for all events: `register<EventName>LoadEntities`.
-- Within the function that is being registered the user must define the criteria for loading the `greetingWithChanges` entity which corresponds to the label defined in the config.
-- This is made available to the user through the load entity context defined as `contextUpdator`.
-- In the case of the above example the `greetingWithChanges` loads a `Greeting` entity that corresponds to the id received from the event.
-
-### Example of registering a `Handler` function for the `NewGreeting` event and using the loaded entity `greetingWithChanges`:
-
-```rescript
-Handlers.Greeter.registerNewGreetingHandler((~event, ~context) => {
-  let currentGreeterOpt = context.greeting.greetingWithChanges()
-
-  switch currentGreeterOpt {
-  | Some(existingGreeter) => {
-      let greetingObject: greetingEntity = {
-        id: event.params.user->Address.toString,
-        latestGreeting: event.params.greeting,
-        numberOfGreetings: existingGreeter.numberOfGreetings + 1,
-      }
-
-      context.greeting.update(greetingObject)
-    }
-
-  | None =>
-    let greetingObject: greetingEntity = {
-      id: event.params.user->Address.toString,
-      latestGreeting: event.params.greeting,
-      numberOfGreetings: 1,
-    }
-
-    context.greeting.insert(greetingObject)
-  }
-})
-```
-
-- The handler functions also follow a naming convention for all events in the form of: `register<EventName>Handler`.
-- Once the user has defined their `loadEntities` function, they are then able to retrieve the loaded entity information via the labels defined in the `config.yaml` file.
-- In the above example, if a `Greeting` entity is found matching the load criteria in the `loadEntities` function, it will be available via `greetingWithChanges`.
-- This is made available to the user through the handler context defined simply as `context`.
-- This `context` is the gateway by which the user can interact with the indexer and the underlying database.
-- The user can then modify this retrieved entity and subsequently update the `Greeting` entity in the database.
-- This is done via the `context` using the update function (`context.greeter.update(greetingObject)`).
-- The user has access to a `greetingEntity` type that has all the fields defined in the schema.
-
-This context also provides the following functions per entity that can be used to interact with that entity:
-
-- insert
-- update
-- delete
diff --git a/codegenerator/cli/templates/static/greeter_template/rescript/config.yaml b/codegenerator/cli/templates/static/greeter_template/rescript/config.yaml
deleted file mode 100644
index 2f38a02aa..000000000
--- a/codegenerator/cli/templates/static/greeter_template/rescript/config.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
-name: Greeter
-description: Greeter indexer
-#Global contract definitions that must contain all definitions except
-#addresses. Now you can share a single handler/abi/event definitions
-#for contracts across multiple chains
-contracts:
-  - name: Greeter
-    abi_file_path: ./abis/greeter-abi.json
-    handler: ./src/EventHandlers.res.js
-    events:
-      - event: NewGreeting
-      - event: ClearGreeting
-networks:
-  - id: 137 # Polygon
-    start_block: 45336336
-    contracts:
-      - name: Greeter #A reference to the global contract definition
-        address: 0x9D02A17dE4E68545d3a58D3a20BbBE0399E05c9c
-  - id: 59144 # Linea
-    start_block: 367801
-    contracts:
-      - name: Greeter #A reference to the global contract definition
-        address: 0xdEe21B97AB77a16B4b236F952e586cf8408CF32A
-# Unordered multichain mode allows you to index events from multiple chains
-# in realtime but doesn't guarentee ordering between chains
-# https://docs.envio.dev/docs/HyperIndex/multichain-indexing#unordered-multichain-mode
-unordered_multichain_mode: true
-# Preload optimisation makes your indexer much faster.
-# But be aware that your handlers will run twice,
-# so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/greeter_template/rescript/rescript.json b/codegenerator/cli/templates/static/greeter_template/rescript/rescript.json
deleted file mode 100644
index 329a63a3a..000000000
--- a/codegenerator/cli/templates/static/greeter_template/rescript/rescript.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "greeter",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    },
-    {
-      "dir": "test",
-      "subdirs": true
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "jsx": {
-    "version": 4
-  },
-  "suffix": ".res.js",
-  "bs-dependencies": ["generated", "envio", "rescript-schema"]
-}
diff --git a/codegenerator/cli/templates/static/greeter_template/rescript/src/EventHandlers.res b/codegenerator/cli/templates/static/greeter_template/rescript/src/EventHandlers.res
deleted file mode 100644
index 0b3a8c93d..000000000
--- a/codegenerator/cli/templates/static/greeter_template/rescript/src/EventHandlers.res
+++ /dev/null
@@ -1,39 +0,0 @@
-open Types
-
-// Handler for the NewGreeting event
-Handlers.Greeter.NewGreeting.handler(async ({event, context}) => {
-  let userId = event.params.user->Address.toString // The id for the User entity
-  let latestGreeting = event.params.greeting // The greeting string that was added
-  let maybeCurrentUserEntity = await context.user.get(userId) // Optional User entity that may already exist
-
-  // Update or create a new User entity
-  let userEntity: Entities.User.t = switch maybeCurrentUserEntity {
-  | Some(existingUserEntity) => {
-      id: userId,
-      latestGreeting,
-      numberOfGreetings: existingUserEntity.numberOfGreetings + 1,
-      greetings: existingUserEntity.greetings->Belt.Array.concat([latestGreeting]),
-    }
-  | None => {
-      id: userId,
-      latestGreeting,
-      numberOfGreetings: 1,
-      greetings: [latestGreeting],
-    }
-  }
-
-  context.user.set(userEntity) // Set the User entity in the DB
-})
-
-// Handler for the ClearGreeting event
-Handlers.Greeter.ClearGreeting.handler(async ({event, context}) => {
-  let userId = event.params.user->Address.toString // The id for the User entity
-  let maybeCurrentUserEntity = await context.user.get(userId) // Optional User entity that may already exist
-
-  switch maybeCurrentUserEntity {
-  | Some(existingUserEntity) =>
-    context.user.set({...existingUserEntity, latestGreeting: ""}) // Clear the latestGreeting
-  | None => ()
-  }
-})
-
diff --git a/codegenerator/cli/templates/static/greeter_template/rescript/test/Test.res b/codegenerator/cli/templates/static/greeter_template/rescript/test/Test.res
deleted file mode 100644
index 24ff1ba75..000000000
--- a/codegenerator/cli/templates/static/greeter_template/rescript/test/Test.res
+++ /dev/null
@@ -1,133 +0,0 @@
-open RescriptMocha
-
-open Belt
-
-describe("Greeter template tests", () => {
-  Async.it("A NewGreeting event creates a User entity", async () => {
-    // Initializing the mock database
-    let mockDbInitial = TestHelpers.MockDb.createMockDb()
-
-    // Initializing values for mock event
-    let userAddress = TestHelpers.Addresses.defaultAddress
-    let greeting = "Hi there"
-
-    // Creating a mock event
-    let mockNewGreetingEvent = TestHelpers.Greeter.NewGreeting.createMockEvent({
-      greeting,
-      user: userAddress,
-    })
-
-    // Processing the mock event on the mock database
-    let updatedMockDb = await TestHelpers.Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    })
-
-    // Expected entity that should be created
-    let expectedUserEntity: Entities.User.t = {
-      id: userAddress->Address.toString,
-      latestGreeting: greeting,
-      numberOfGreetings: 1,
-      greetings: [greeting],
-    }
-
-    // Getting the entity from the mock database
-    let actualUserEntity =
-      updatedMockDb.entities.user.get(userAddress->Address.toString)->Option.getExn
-
-    // Asserting that the entity in the mock database is the same as the expected entity
-    Assert.deepEqual(expectedUserEntity, actualUserEntity)
-  })
-
-  Async.it(
-    "2 Greetings from the same users results in that user having a greeter count of 2",
-    async () => {
-      // Initializing the mock database
-      let mockDbInitial = TestHelpers.MockDb.createMockDb()
-
-      // Initializing values for mock event
-      let userAddress = TestHelpers.Addresses.defaultAddress
-      let greeting = "Hi there"
-      let greetingAgain = "Oh hello again"
-
-      // Creating a mock event
-      let mockNewGreetingEvent = TestHelpers.Greeter.NewGreeting.createMockEvent({
-        greeting,
-        user: userAddress,
-      })
-
-      // Creating a mock event
-      let mockNewGreetingEvent2 = TestHelpers.Greeter.NewGreeting.createMockEvent({
-        greeting: greetingAgain,
-        user: userAddress,
-      })
-
-      // Processing the mock event on the mock database
-      let updatedMockDb = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent,
-        mockDb: mockDbInitial,
-      })
-
-      // Processing the mock event on the updated mock database
-      let updatedMockDb2 = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent2,
-        mockDb: updatedMockDb,
-      })
-
-      let expectedGreetingCount = 2
-
-      // Getting the entity from the mock database
-      let actualUserEntity =
-        updatedMockDb2.entities.user.get(userAddress->Address.toString)->Option.getExn
-
-      // Asserting that the field value of the entity in the mock database is the same as the expected field value
-      Assert.equal(actualUserEntity.numberOfGreetings, expectedGreetingCount)
-    },
-  )
-
-  Async.it(
-    "2 Greetings from the same users results in the latest greeting being the greeting from the second event",
-    async () => {
-      // Initializing the mock database
-      let mockDbInitial = TestHelpers.MockDb.createMockDb()
-
-      // Initializing values for mock event
-      let userAddress = TestHelpers.Addresses.defaultAddress
-      let greeting = "Hi there"
-      let greetingAgain = "Oh hello again"
-
-      // Creating a mock event
-      let mockNewGreetingEvent = TestHelpers.Greeter.NewGreeting.createMockEvent({
-        greeting,
-        user: userAddress,
-      })
-
-      // Creating a mock event
-      let mockNewGreetingEvent2 = TestHelpers.Greeter.NewGreeting.createMockEvent({
-        greeting: greetingAgain,
-        user: userAddress,
-      })
-
-      // Processing the mock event on the mock database
-      let updatedMockDb = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent,
-        mockDb: mockDbInitial,
-      })
-
-      // Processing the mock event on the updated mock database
-      let updatedMockDb2 = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent2,
-        mockDb: updatedMockDb,
-      })
-
-      // Getting the entity from the mock database
-      let actualUserEntity =
-        updatedMockDb2.entities.user.get(userAddress->Address.toString)->Option.getExn
-
-      let expectedGreeting = greetingAgain
-
-      // Asserting that the field value of the entity in the mock database is the same as the expected field value
-      Assert.equal(actualUserEntity.latestGreeting, expectedGreeting)
-    },
-  )
-})
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/README.md b/codegenerator/cli/templates/static/greeteronfuel_template/javascript/README.md
deleted file mode 100644
index 38d9075c8..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## Envio Greeter Template on FuelVM
-
-_Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all Envio indexer features_
-
-### Run
-
-```bash
-pnpm dev
-```
-
-Visit http://localhost:8080 to see the GraphQL Playground, local password is `testing`.
-
-### Generate files from `config.yaml` or `schema.graphql`
-
-```bash
-pnpm codegen
-```
-
-### Pre-requisites
-
-- [Node.js (use v18 or newer)](https://nodejs.org/en/download/current)
-- [pnpm (use v8 or newer)](https://pnpm.io/installation)
-- [Docker desktop](https://www.docker.com/products/docker-desktop/)
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/config.yaml b/codegenerator/cli/templates/static/greeteronfuel_template/javascript/config.yaml
deleted file mode 100644
index 710a19047..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/config.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# yaml-language-server: $schema=./node_modules/envio/fuel.schema.json
-name: Fuel Greeter Indexer
-ecosystem: fuel
-networks:
-  - id: 0
-    start_block: 0
-    contracts:
-      - name: Greeter
-        address: 0xb9bc445e5696c966dcf7e5d1237bd03c04e3ba6929bdaedfeebc7aae784c3a0b
-        abi_file_path: abis/greeter-abi.json
-        handler: ./src/EventHandlers.js
-        events:
-          - name: NewGreeting
-          - name: ClearGreeting
-# Preload optimisation makes your indexer much faster.
-# But be aware that your handlers will run twice,
-# so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/src/EventHandlers.js b/codegenerator/cli/templates/static/greeteronfuel_template/javascript/src/EventHandlers.js
deleted file mode 100644
index f2e23121d..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/src/EventHandlers.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const { Greeter } = require("generated");
-
-// Handler for the NewGreeting event
-Greeter.NewGreeting.handler(async ({ event, context }) => {
-  const userId = event.params.user.bits; // The id for the User entity
-  const latestGreeting = event.params.greeting.value; // The greeting string that was added
-  const currentUserEntity = await context.User.get(userId); // Optional user entity that may already exist
-
-  // Update or create a new User entity
-  const userEntity = currentUserEntity
-    ? {
-        id: userId,
-        latestGreeting,
-        numberOfGreetings: currentUserEntity.numberOfGreetings + 1,
-        greetings: [...currentUserEntity.greetings, latestGreeting],
-      }
-    : {
-        id: userId,
-        latestGreeting,
-        numberOfGreetings: 1,
-        greetings: [latestGreeting],
-      };
-
-  context.User.set(userEntity); // Set the User entity in the DB
-});
-
-// Handler for the ClearGreeting event
-Greeter.ClearGreeting.handler(async ({ event, context }) => {
-  const userId = event.params.user.bits; // The id for the User entity
-  const currentUserEntity = await context.User.get(userId); // Optional user entity that may already exist
-
-  if (currentUserEntity) {
-    context.User.set({
-      ...currentUserEntity,
-      latestGreeting: "", // Clear the latestGreeting
-    });
-  }
-});
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/test/test.js b/codegenerator/cli/templates/static/greeteronfuel_template/javascript/test/test.js
deleted file mode 100644
index 7fafd966c..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/javascript/test/test.js
+++ /dev/null
@@ -1,119 +0,0 @@
-const assert = require("assert");
-const { TestHelpers } = require("generated");
-const { MockDb, Greeter, Addresses } = TestHelpers;
-
-describe("Greeter template tests", () => {
-  it("A NewGreeting event creates a User entity", async () => {
-    // Initializing the mock database
-    const mockDbInitial = MockDb.createMockDb();
-
-    // Initializing values for mock event
-    const userAddress = Addresses.defaultAddress;
-    const greeting = "Hi there";
-
-    // Creating a mock event
-    const mockNewGreetingEvent = Greeter.NewGreeting.mockData({
-      greeting: { value: greeting },
-      user: { bits: userAddress },
-    });
-
-    // Processing the mock event on the mock database
-    const updatedMockDb = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    });
-
-    // Expected entity that should be created
-    const expectedUserEntity = {
-      id: userAddress,
-      latestGreeting: greeting,
-      numberOfGreetings: 1,
-      greetings: [greeting],
-    };
-
-    // Getting the entity from the mock database
-    const actualUserEntity = updatedMockDb.entities.User.get(userAddress);
-
-    // Asserting that the entity in the mock database is the same as the expected entity
-    assert.deepEqual(expectedUserEntity, actualUserEntity);
-  });
-
-  it("2 Greetings from the same users results in that user having a greeter count of 2", async () => {
-    // Initializing the mock database
-    const mockDbInitial = MockDb.createMockDb();
-    // Initializing values for mock event
-    const userAddress = Addresses.defaultAddress;
-    const greeting = "Hi there";
-
-    // Creating a mock event
-    const mockNewGreetingEvent = Greeter.NewGreeting.mockData({
-      greeting: { value: greeting },
-      user: { bits: userAddress },
-    });
-
-    // Creating a mock event
-    const mockNewGreetingEvent2 = Greeter.NewGreeting.mockData({
-      greeting: { value: greeting },
-      user: { bits: userAddress },
-    });
-
-    // Processing the mock event on the mock database
-    const updatedMockDb = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    });
-
-    // Processing the mock event on the updated mock database
-    const updatedMockDb2 = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent2,
-      mockDb: updatedMockDb,
-    });
-
-    // Getting the entity from the mock database
-    const actualUserEntity = updatedMockDb2.entities.User.get(userAddress);
-
-    // Asserting that the field value of the entity in the mock database is the same as the expected field value
-    assert.equal(2, actualUserEntity?.numberOfGreetings);
-  });
-
-  it("2 Greetings from the same users results in the latest greeting being the greeting from the second event", async () => {
-    // Initializing the mock database
-    const mockDbInitial = MockDb.createMockDb();
-    // Initializing values for mock event
-    const userAddress = Addresses.defaultAddress;
-    const greeting = "Hi there";
-    const greetingAgain = "Oh hello again";
-
-    // Creating a mock event
-    const mockNewGreetingEvent = Greeter.NewGreeting.mockData({
-      greeting: { value: greeting },
-      user: { bits: userAddress },
-    });
-
-    // Creating a mock event
-    const mockNewGreetingEvent2 = Greeter.NewGreeting.mockData({
-      greeting: { value: greetingAgain },
-      user: { bits: userAddress },
-    });
-
-    // Processing the mock event on the mock database
-    const updatedMockDb = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    });
-
-    // Processing the mock event on the updated mock database
-    const updatedMockDb2 = await Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent2,
-      mockDb: updatedMockDb,
-    });
-
-    // Getting the entity from the mock database
-    const actualUserEntity = updatedMockDb2.entities.User.get(userAddress);
-
-    const expectedGreeting = greetingAgain;
-
-    // Asserting that the field value of the entity in the mock database is the same as the expected field value
-    assert.equal(expectedGreeting, actualUserEntity?.latestGreeting);
-  });
-});
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/README.md b/codegenerator/cli/templates/static/greeteronfuel_template/rescript/README.md
deleted file mode 100644
index 38d9075c8..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-## Envio Greeter Template on FuelVM
-
-_Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all Envio indexer features_
-
-### Run
-
-```bash
-pnpm dev
-```
-
-Visit http://localhost:8080 to see the GraphQL Playground, local password is `testing`.
-
-### Generate files from `config.yaml` or `schema.graphql`
-
-```bash
-pnpm codegen
-```
-
-### Pre-requisites
-
-- [Node.js (use v18 or newer)](https://nodejs.org/en/download/current)
-- [pnpm (use v8 or newer)](https://pnpm.io/installation)
-- [Docker desktop](https://www.docker.com/products/docker-desktop/)
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/config.yaml b/codegenerator/cli/templates/static/greeteronfuel_template/rescript/config.yaml
deleted file mode 100644
index e805d0699..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/config.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# yaml-language-server: $schema=./node_modules/envio/fuel.schema.json
-name: Fuel Greeter Indexer
-ecosystem: fuel
-networks:
-  - id: 0
-    start_block: 0
-    contracts:
-      - name: Greeter
-        address: 0xb9bc445e5696c966dcf7e5d1237bd03c04e3ba6929bdaedfeebc7aae784c3a0b
-        abi_file_path: abis/greeter-abi.json
-        handler: ./src/EventHandlers.res.js
-        events:
-          - name: NewGreeting
-          - name: ClearGreeting
-# Preload optimisation makes your indexer much faster.
-# But be aware that your handlers will run twice,
-# so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/rescript.json b/codegenerator/cli/templates/static/greeteronfuel_template/rescript/rescript.json
deleted file mode 100644
index 329a63a3a..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/rescript.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "greeter",
-  "version": "0.1.0",
-  "sources": [
-    {
-      "dir": "src",
-      "subdirs": true
-    },
-    {
-      "dir": "test",
-      "subdirs": true
-    }
-  ],
-  "package-specs": {
-    "module": "commonjs",
-    "in-source": true
-  },
-  "jsx": {
-    "version": 4
-  },
-  "suffix": ".res.js",
-  "bs-dependencies": ["generated", "envio", "rescript-schema"]
-}
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/src/EventHandlers.res b/codegenerator/cli/templates/static/greeteronfuel_template/rescript/src/EventHandlers.res
deleted file mode 100644
index 41452e263..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/src/EventHandlers.res
+++ /dev/null
@@ -1,37 +0,0 @@
-open Types
-
-// Handler for the NewGreeting event
-Handlers.Greeter.NewGreeting.handler(async ({event, context}) => {
-  let userId = event.params.user.bits // The id for the User entity
-  let latestGreeting = event.params.greeting.value // The greeting string that was added
-  let maybeCurrentUserEntity = await context.user.get(userId) // Optional User entity that may already exist
-
-  // Update or create a new User entity
-  let userEntity: Entities.User.t = switch maybeCurrentUserEntity {
-  | Some(existingUserEntity) => {
-      id: userId,
-      latestGreeting,
-      numberOfGreetings: existingUserEntity.numberOfGreetings + 1,
-      greetings: existingUserEntity.greetings->Belt.Array.concat([latestGreeting]),
-    }
-  | None => {
-      id: userId,
-      latestGreeting,
-      numberOfGreetings: 1,
-      greetings: [latestGreeting],
-    }
-  }
-
-  context.user.set(userEntity) // Set the User entity in the DB
-})
-
-// Handler for the ClearGreeting event
-Handlers.Greeter.ClearGreeting.handler(async ({event, context}) => {
-  let userId = event.params.user.bits // The id for the User entity
-  let maybeCurrentUserEntity = await context.user.get(userId) // Optional User entity that may already exist
-
-  switch maybeCurrentUserEntity {
-  | Some(existingUserEntity) => context.user.set({...existingUserEntity, latestGreeting: ""}) // Clear the latestGreeting
-  | None => ()
-  }
-})
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/test/Test.res b/codegenerator/cli/templates/static/greeteronfuel_template/rescript/test/Test.res
deleted file mode 100644
index fa40b6b8e..000000000
--- a/codegenerator/cli/templates/static/greeteronfuel_template/rescript/test/Test.res
+++ /dev/null
@@ -1,132 +0,0 @@
-open RescriptMocha
-open Belt
-
-describe("Greeter template tests", () => {
-  Async.it("A NewGreeting event creates a User entity", async () => {
-    // Initializing the mock database
-    let mockDbInitial = TestHelpers.MockDb.createMockDb()
-
-    // Initializing values for mock event
-    let userAddress = TestHelpers.Addresses.defaultAddress
-    let greeting = "Hi there"
-
-    // Creating a mock event
-    let mockNewGreetingEvent = TestHelpers.Greeter.NewGreeting.mockData({
-      greeting: {value: greeting},
-      user: {bits: userAddress->Address.toString},
-    })
-
-    // Processing the mock event on the mock database
-    let updatedMockDb = await TestHelpers.Greeter.NewGreeting.processEvent({
-      event: mockNewGreetingEvent,
-      mockDb: mockDbInitial,
-    })
-
-    // Expected entity that should be created
-    let expectedUserEntity: Types.user = {
-      id: userAddress->Address.toString,
-      latestGreeting: greeting,
-      numberOfGreetings: 1,
-      greetings: [greeting],
-    }
-
-    // Getting the entity from the mock database
-    let actualUserEntity =
-      updatedMockDb.entities.user.get(userAddress->Address.toString)->Option.getExn
-
-    // Asserting that the entity in the mock database is the same as the expected entity
-    Assert.deepEqual(expectedUserEntity, actualUserEntity)
-  })
-
-  Async.it(
-    "2 Greetings from the same users results in that user having a greeter count of 2",
-    async () => {
-      // Initializing the mock database
-      let mockDbInitial = TestHelpers.MockDb.createMockDb()
-
-      // Initializing values for mock event
-      let userAddress = TestHelpers.Addresses.defaultAddress
-      let greeting = "Hi there"
-      let greetingAgain = "Oh hello again"
-
-      // Creating a mock event
-      let mockNewGreetingEvent = TestHelpers.Greeter.NewGreeting.mockData({
-        greeting: {value: greeting},
-        user: {bits: userAddress->Address.toString},
-      })
-
-      // Creating a mock event
-      let mockNewGreetingEvent2 = TestHelpers.Greeter.NewGreeting.mockData({
-        greeting: {value: greetingAgain},
-        user: {bits: userAddress->Address.toString},
-      })
-
-      // Processing the mock event on the mock database
-      let updatedMockDb = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent,
-        mockDb: mockDbInitial,
-      })
-
-      // Processing the mock event on the updated mock database
-      let updatedMockDb2 = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent2,
-        mockDb: updatedMockDb,
-      })
-
-      let expectedGreetingCount = 2
-
-      // Getting the entity from the mock database
-      let actualUserEntity =
-        updatedMockDb2.entities.user.get(userAddress->Address.toString)->Option.getExn
-
-      // Asserting that the field value of the entity in the mock database is the same as the expected field value
-      Assert.equal(actualUserEntity.numberOfGreetings, expectedGreetingCount)
-    },
-  )
-
-  Async.it(
-    "2 Greetings from the same users results in the latest greeting being the greeting from the second event",
-    async () => {
-      // Initializing the mock database
-      let mockDbInitial = TestHelpers.MockDb.createMockDb()
-
-      // Initializing values for mock event
-      let userAddress = TestHelpers.Addresses.defaultAddress
-      let greeting = "Hi there"
-      let greetingAgain = "Oh hello again"
-
-      // Creating a mock event
-      let mockNewGreetingEvent = TestHelpers.Greeter.NewGreeting.mockData({
-        greeting: {value: greeting},
-        user: {bits: userAddress->Address.toString},
-      })
-
-      // Creating a mock event
-      let mockNewGreetingEvent2 = TestHelpers.Greeter.NewGreeting.mockData({
-        greeting: {value: greetingAgain},
-        user: {bits: userAddress->Address.toString},
-      })
-
-      // Processing the mock event on the mock database
-      let updatedMockDb = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent,
-        mockDb: mockDbInitial,
-      })
-
-      // Processing the mock event on the updated mock database
-      let updatedMockDb2 = await TestHelpers.Greeter.NewGreeting.processEvent({
-        event: mockNewGreetingEvent2,
-        mockDb: updatedMockDb,
-      })
-
-      // Getting the entity from the mock database
-      let actualUserEntity =
-        updatedMockDb2.entities.user.get(userAddress->Address.toString)->Option.getExn
-
-      let expectedGreeting = greetingAgain
-
-      // Asserting that the field value of the entity in the mock database is the same as the expected field value
-      Assert.equal(actualUserEntity.latestGreeting, expectedGreeting)
-    },
-  )
-})
diff --git a/codegenerator/cli/templates/static/greeteronfuel_template/typescript/config.yaml b/codegenerator/cli/templates/static/greeteronfuel_template/typescript/config.yaml
index 42d203d66..112de5426 100644
--- a/codegenerator/cli/templates/static/greeteronfuel_template/typescript/config.yaml
+++ b/codegenerator/cli/templates/static/greeteronfuel_template/typescript/config.yaml
@@ -15,7 +15,4 @@ networks:
 # Preload optimisation makes your indexer much faster.
 # But be aware that your handlers will run twice,
 # so make sure to use Effect API for external calls.
-preload_handlers: true
-# Address format for Ethereum addresses: 'checksum' or 'lowercase'
-# using lowercase addresses is slightly faster
-address_format: lowercase
\ No newline at end of file
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/shared/.env.example b/codegenerator/cli/templates/static/multichain_indexer_template/shared/.env.example
new file mode 100644
index 000000000..7d6a1dedc
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/shared/.env.example
@@ -0,0 +1,2 @@
+# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_API_TOKEN="<YOUR-API-TOKEN>"
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/shared/.gitignore b/codegenerator/cli/templates/static/multichain_indexer_template/shared/.gitignore
new file mode 100644
index 000000000..07b74f471
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/shared/.gitignore
@@ -0,0 +1,35 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/*
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
+node_modules/
+build/
+benchmarks/
+artifacts
+cache
+*.res.js
+*.res.mjs
+generated
+.env
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/shared/README.md b/codegenerator/cli/templates/static/multichain_indexer_template/shared/README.md
new file mode 100644
index 000000000..47b256406
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/shared/README.md
@@ -0,0 +1,44 @@
+## Multichain Indexing
+
+_Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all [Envio](https://envio.dev) indexer features_
+
+With **HyperIndex**, developers can index events emitted across **multiple chains** within a single indexer. This example demonstrates how to index the **Uniswap V3 Factory** contract across **Ethereum Mainnet**, **Arbitrum Mainnet**, and **Unichain Mainnet**.
+
+You can learn more about multichain indexing in the documentation: [https://docs.envio.dev/docs/HyperIndex/multichain-indexing](https://docs.envio.dev/docs/HyperIndex/multichain-indexing).
+
+To add more networks to your indexer, simply include an additional network entry in your `config.yaml`:
+
+```yaml
+- id: NETWORK_ID
+  start_block: STARTING_BLOCK
+  contracts:
+      - name: YOUR_CONTRACT
+        address:
+            - CONTRACT_ADDRESS
+```
+
+## Prerequisites
+
+Before running the indexer locally, make sure you have the following installed:
+
+-   **[Node.js 18+](https://nodejs.org/en/download/)**
+-   **[pnpm](https://pnpm.io/installation)**
+-   **[Docker Desktop](https://www.docker.com/products/docker-desktop/)**
+
+## Running the Indexer
+
+Add your Envio API key to the .env file, then start the indexer:
+
+```bash
+pnpm dev
+```
+
+If you make changes to `config.yaml` or `schema.graphql`, regenerate the type files:
+
+```bash
+pnpm codegen
+```
+
+## GraphQL Playground
+
+While indexer is running, visit the Envio Console([https://envio.dev/console](https://envio.dev/console)) to open the GraphQL Playground and query your indexed data.
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/shared/schema.graphql b/codegenerator/cli/templates/static/multichain_indexer_template/shared/schema.graphql
new file mode 100644
index 000000000..1f42d1c26
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/shared/schema.graphql
@@ -0,0 +1,20 @@
+type UniswapV3Factory_FeeAmountEnabled {
+  id: ID!
+  fee: BigInt!
+  tickSpacing: BigInt!
+}
+
+type UniswapV3Factory_OwnerChanged {
+  id: ID!
+  oldOwner: String!
+  newOwner: String!
+}
+
+type UniswapV3Factory_PoolCreated {
+  id: ID!
+  token0: String!
+  token1: String!
+  fee: BigInt!
+  tickSpacing: BigInt!
+  pool: String!
+}
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/typescript/config.yaml b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/config.yaml
new file mode 100644
index 000000000..79517aff3
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/config.yaml
@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
+name: multichain-indexer
+contracts:
+- name: UniswapV3Factory
+  handler: src/EventHandlers.ts
+  events:
+  - event: FeeAmountEnabled(uint24 indexed fee, int24 indexed tickSpacing)
+  - event: OwnerChanged(address indexed oldOwner, address indexed newOwner)
+  - event: PoolCreated(address indexed token0, address indexed token1, uint24 indexed fee, int24 tickSpacing, address pool)
+networks:
+- id: 1
+  start_block: 0
+  contracts:
+  - name: UniswapV3Factory
+    address:
+    - 0x1F98431c8aD98523631AE4a59f267346ea31F984
+- id: 130
+  start_block: 0
+  contracts:
+  - name: UniswapV3Factory
+    address:
+    - 0x1F98400000000000000000000000000000000003
+- id: 42161
+  start_block: 0
+  contracts:
+  - name: UniswapV3Factory
+    address:
+    - 0x1F98431c8aD98523631AE4a59f267346ea31F984
+unordered_multichain_mode: true
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/typescript/src/EventHandlers.ts b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/src/EventHandlers.ts
new file mode 100644
index 000000000..44de3db17
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/src/EventHandlers.ts
@@ -0,0 +1,42 @@
+/*
+ * Please refer to https://docs.envio.dev for a thorough guide on all Envio indexer features
+ */
+import {
+    UniswapV3Factory,
+    UniswapV3Factory_FeeAmountEnabled,
+    UniswapV3Factory_OwnerChanged,
+    UniswapV3Factory_PoolCreated,
+} from "generated";
+
+UniswapV3Factory.FeeAmountEnabled.handler(async ({ event, context }) => {
+    const entity: UniswapV3Factory_FeeAmountEnabled = {
+        id: `${event.chainId}_${event.block.number}_${event.logIndex}`,
+        fee: event.params.fee,
+        tickSpacing: event.params.tickSpacing,
+    };
+
+    context.UniswapV3Factory_FeeAmountEnabled.set(entity);
+});
+
+UniswapV3Factory.OwnerChanged.handler(async ({ event, context }) => {
+    const entity: UniswapV3Factory_OwnerChanged = {
+        id: `${event.chainId}_${event.block.number}_${event.logIndex}`,
+        oldOwner: event.params.oldOwner,
+        newOwner: event.params.newOwner,
+    };
+
+    context.UniswapV3Factory_OwnerChanged.set(entity);
+});
+
+UniswapV3Factory.PoolCreated.handler(async ({ event, context }) => {
+    const entity: UniswapV3Factory_PoolCreated = {
+        id: `${event.chainId}_${event.block.number}_${event.logIndex}`,
+        token0: event.params.token0,
+        token1: event.params.token1,
+        fee: event.params.fee,
+        tickSpacing: event.params.tickSpacing,
+        pool: event.params.pool,
+    };
+
+    context.UniswapV3Factory_PoolCreated.set(entity);
+});
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/typescript/test/test.ts b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/test/test.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/codegenerator/cli/templates/static/multichain_indexer_template/typescript/tsconfig.json b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/tsconfig.json
new file mode 100644
index 000000000..230241339
--- /dev/null
+++ b/codegenerator/cli/templates/static/multichain_indexer_template/typescript/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020", //required for use with BigInt types
+    "lib": [
+      "es2020"
+    ],
+    "allowJs": true,
+    "checkJs": false,
+    "outDir": "build",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/shared/.env.example b/codegenerator/cli/templates/static/onblock_handler_template/shared/.env.example
new file mode 100644
index 000000000..7d6a1dedc
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/shared/.env.example
@@ -0,0 +1,2 @@
+# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_API_TOKEN="<YOUR-API-TOKEN>"
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/shared/.gitignore b/codegenerator/cli/templates/static/onblock_handler_template/shared/.gitignore
new file mode 100644
index 000000000..07b74f471
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/shared/.gitignore
@@ -0,0 +1,35 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/*
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
+node_modules/
+build/
+benchmarks/
+artifacts
+cache
+*.res.js
+*.res.mjs
+generated
+.env
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/shared/README.md b/codegenerator/cli/templates/static/onblock_handler_template/shared/README.md
new file mode 100644
index 000000000..de07abfb9
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/shared/README.md
@@ -0,0 +1,61 @@
+# onBlock API
+
+*Please refer to the [documentation website](https://docs.envio.dev) for a thorough guide on all [Envio](https://envio.dev) indexer features*
+
+The `onBlock` API of HyperIndex lets you run custom logic on every block or at fixed block intervals. This is useful for aggregations, time-series operations, and bulk updates.
+
+In this example, we'll walk through how to use the `onBlock` handler to take a snapshot of a token's total supply every 1000 blocks.
+
+## Creating the Handler
+
+First, import `onBlock` from `generated`:
+
+```ts
+import { onBlock } from "generated";
+````
+
+The `onBlock` function takes two arguments:
+
+1. **Options** – configure the handler's name, the chain it should run on, and interval-related settings such as `interval`, `startBlock`, and `stopBlock`.
+2. **Handler function** – contains your custom logic. Similar event handlers, it has access to relevant data, which in this case is block values like `timestamp` and `chainId`.
+
+Example usage:
+
+```ts
+onBlock(
+    {
+        name: "MY_BLOCK_HANDLER",
+        chain: CHAIN_ID,
+        interval: BLOCK_INTERVAL
+    },
+    async ({ block, context }) => {
+        // your onBlock logic here
+    }
+)
+```
+
+## Prerequisites
+
+Before running the indexer locally, make sure you have the following installed:
+
+-   **[Node.js 18+](https://nodejs.org/en/download/)**
+-   **[pnpm](https://pnpm.io/installation)**
+-   **[Docker Desktop](https://www.docker.com/products/docker-desktop/)**
+
+## Running the Indexer
+
+Add your Envio API key to the .env file, then start the indexer:
+
+```bash
+pnpm dev
+```
+
+If you make changes to `config.yaml` or `schema.graphql`, regenerate the type files:
+
+```bash
+pnpm codegen
+```
+
+## GraphQL Playground
+
+While indexer is running, visit the Envio Console([https://envio.dev/console](https://envio.dev/console)) to open the GraphQL Playground and query your indexed data.
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/shared/schema.graphql b/codegenerator/cli/templates/static/onblock_handler_template/shared/schema.graphql
new file mode 100644
index 000000000..3c81f217d
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/shared/schema.graphql
@@ -0,0 +1,13 @@
+type TotalSupply {
+  id: ID!
+  currentSupply: BigInt!
+  blockNumber: BigInt!
+  timestamp: BigInt!
+}
+
+type TotalSupplySnapshot {
+  id: ID!
+  supply: BigInt!
+  blockNumber: BigInt!
+  timestamp: BigInt!
+}
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/typescript/config.yaml b/codegenerator/cli/templates/static/onblock_handler_template/typescript/config.yaml
new file mode 100644
index 000000000..1361be776
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/typescript/config.yaml
@@ -0,0 +1,16 @@
+# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
+name: onblock-template
+contracts:
+  - name: ERC20
+    handler: src/EventHandlers.ts
+    events:
+      - event: Transfer(address indexed from, address indexed to, uint256 amount)
+networks:
+  - id: 1
+    start_block: 0
+    contracts:
+      - name: ERC20
+        address:
+          - 0xA1290d69c65A6Fe4DF752f95823fae25cB99e5A7 # rsETH token    handler: src/EventHandlers.ts
+unordered_multichain_mode: true
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/typescript/src/EventHandlers.ts b/codegenerator/cli/templates/static/onblock_handler_template/typescript/src/EventHandlers.ts
new file mode 100644
index 000000000..b23bdcc74
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/typescript/src/EventHandlers.ts
@@ -0,0 +1,75 @@
+/*
+ * Please refer to https://docs.envio.dev for a thorough guide on all Envio indexer features
+ */
+import {
+    ERC20,
+    TotalSupply,
+    TotalSupplySnapshot,
+    onBlock
+} from "generated";
+
+const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+
+onBlock(
+    {
+        name: "TotalSupplySnapshot",
+        chain: 1,
+        interval: 1000,
+    }
+    ,
+    async ({ block, context }) => {
+        const latestSupply = await context.TotalSupply.get("latest");
+        if (!latestSupply) {
+            return;
+        }
+
+        const supply = latestSupply.currentSupply;
+        const blockNumber = latestSupply.blockNumber;
+        const timestamp = latestSupply.timestamp;
+
+        const totalSupplySnapshot: TotalSupplySnapshot = {
+            id: `${block.chainId}_${block.number}`,
+            supply: supply,
+            blockNumber: blockNumber,
+            timestamp: timestamp,
+        };
+
+        context.TotalSupplySnapshot.set(totalSupplySnapshot);
+    });
+
+ERC20.Transfer.handler(async ({ event, context }) => {
+    const { from, to, amount } = event.params;
+
+    // Only track transfers to/from zero address (minting/burning)
+    if (from.toLowerCase() !== ZERO_ADDRESS && to.toLowerCase() !== ZERO_ADDRESS) {
+        return;
+    }
+
+    const latestSupply = await context.TotalSupply.getOrCreate({
+        id: "latest",
+        currentSupply: BigInt(0),
+        blockNumber: BigInt(event.block.number),
+        timestamp: BigInt(event.block.timestamp),
+    });
+
+    // Calculate new total supply
+    let newSupply: bigint;
+
+    if (from.toLowerCase() === ZERO_ADDRESS) {
+        // Minting: transfer from zero address increases supply
+        newSupply = latestSupply.currentSupply + amount;
+    } else {
+        // Burning: transfer to zero address decreases supply
+        newSupply = latestSupply.currentSupply - amount;
+    }
+
+    // Update the "latest" entry for future calculations
+    const latestEntity: TotalSupply = {
+        id: "latest",
+        currentSupply: newSupply,
+        blockNumber: BigInt(event.block.number),
+        timestamp: BigInt(event.block.timestamp),
+    };
+
+    context.TotalSupply.set(latestEntity);
+});
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/typescript/test/test.ts b/codegenerator/cli/templates/static/onblock_handler_template/typescript/test/test.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/codegenerator/cli/templates/static/onblock_handler_template/typescript/tsconfig.json b/codegenerator/cli/templates/static/onblock_handler_template/typescript/tsconfig.json
new file mode 100644
index 000000000..230241339
--- /dev/null
+++ b/codegenerator/cli/templates/static/onblock_handler_template/typescript/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020", //required for use with BigInt types
+    "lib": [
+      "es2020"
+    ],
+    "allowJs": true,
+    "checkJs": false,
+    "outDir": "build",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/shared/.env.example b/codegenerator/cli/templates/static/topic_filtering_template/shared/.env.example
new file mode 100644
index 000000000..7d6a1dedc
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/shared/.env.example
@@ -0,0 +1,2 @@
+# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_API_TOKEN="<YOUR-API-TOKEN>"
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/shared/.gitignore b/codegenerator/cli/templates/static/topic_filtering_template/shared/.gitignore
new file mode 100644
index 000000000..07b74f471
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/shared/.gitignore
@@ -0,0 +1,35 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/*
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
+node_modules/
+build/
+benchmarks/
+artifacts
+cache
+*.res.js
+*.res.mjs
+generated
+.env
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/shared/README.md b/codegenerator/cli/templates/static/topic_filtering_template/shared/README.md
new file mode 100644
index 000000000..c26b7cbaa
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/shared/README.md
@@ -0,0 +1,51 @@
+# Topic Filtering
+
+_For a complete guide to all [Envio](https://envio.dev) indexer features, visit the [documentation website](https://docs.envio.dev)._
+
+This example builds on our wildcard indexing example, which demonstrates how to index all events that match a given event signature.
+
+In this version, we add an additional feature that filters those events further based on specific topics within the event data.
+
+You can learn more about Topic Filtering in the documentation: [https://docs.envio.dev/docs/HyperIndex/wildcard-indexing#topic-filtering](https://docs.envio.dev/docs/HyperIndex/wildcard-indexing#topic-filtering)
+
+To enable topic filtering, simply pass `eventFilters: { TOPIC_NAME: TOPIC_VALUE }` in the handler configuration.
+
+```ts
+ERC20.Transfer.handler(
+    async ({ event, context }) => {
+        // ...your handler logic
+    },
+    { 
+        wildcard: true, 
+        eventFilters: { 
+            TOPIC_NAME: TOPIC_VALUE
+        } 
+    }
+);
+```
+
+## Prerequisites
+
+Before running the indexer locally, make sure you have the following installed:
+
+-   **[Node.js 18+](https://nodejs.org/en/download/)**
+-   **[pnpm](https://pnpm.io/installation)**
+-   **[Docker Desktop](https://www.docker.com/products/docker-desktop/)**
+
+## Running the Indexer
+
+Add your Envio API key to the .env file, then start the indexer:
+
+```bash
+pnpm dev
+```
+
+If you make changes to `config.yaml` or `schema.graphql`, regenerate the type files:
+
+```bash
+pnpm codegen
+```
+
+## GraphQL Playground
+
+While indexer is running, visit the Envio Console([https://envio.dev/console](https://envio.dev/console)) to open the GraphQL Playground and query your indexed data.
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/shared/schema.graphql b/codegenerator/cli/templates/static/topic_filtering_template/shared/schema.graphql
new file mode 100644
index 000000000..6bc854a1c
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/shared/schema.graphql
@@ -0,0 +1,12 @@
+type Transfer {
+  # id is combination of chain id, block number, and log index 
+  id: ID!
+  # amount is the amount of tokens transferred
+  amount: BigInt!
+  # from is the account that sent the tokens
+  from: String!
+  # to is the account that received the tokens
+  to: String!
+  # contract is the token contract address
+  contract: String!
+}
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/typescript/config.yaml b/codegenerator/cli/templates/static/topic_filtering_template/typescript/config.yaml
new file mode 100644
index 000000000..996a59d5f
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/typescript/config.yaml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
+name: Topic Filtering
+description: Index all events matching a specified event signature and topics without requiring the contract address
+networks:
+    - id: 1 # Ethereum Mainnet
+      start_block: 23596675
+      contracts:
+          - name: ERC20
+            handler: src/EventHandlers.ts
+            events:
+                - event: "Transfer(address indexed from, address indexed to, uint256 value)"
+
+# https://docs.envio.dev/docs/HyperIndex/multichain-indexing#unordered-multichain-mode
+unordered_multichain_mode: true
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/typescript/src/EventHandlers.ts b/codegenerator/cli/templates/static/topic_filtering_template/typescript/src/EventHandlers.ts
new file mode 100644
index 000000000..26c8ed123
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/typescript/src/EventHandlers.ts
@@ -0,0 +1,23 @@
+import { ERC20 } from "generated";
+
+const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+
+
+ERC20.Transfer.handler(
+  async ({ event, context }) => {
+    context.Transfer.set({
+      id: `${event.chainId}_${event.block.number}_${event.logIndex}`,
+      amount: event.params.value,
+      from: event.params.from,
+      to: event.params.to,
+      contract: event.srcAddress,
+    });
+  },
+  {
+    wildcard: true,
+    eventFilters: {
+      from: ZERO_ADDRESS,
+      to: ZERO_ADDRESS,
+    }
+  },
+);
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/typescript/test/test.ts b/codegenerator/cli/templates/static/topic_filtering_template/typescript/test/test.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/codegenerator/cli/templates/static/topic_filtering_template/typescript/tsconfig.json b/codegenerator/cli/templates/static/topic_filtering_template/typescript/tsconfig.json
new file mode 100644
index 000000000..230241339
--- /dev/null
+++ b/codegenerator/cli/templates/static/topic_filtering_template/typescript/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020", //required for use with BigInt types
+    "lib": [
+      "es2020"
+    ],
+    "allowJs": true,
+    "checkJs": false,
+    "outDir": "build",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/shared/.env.example b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/.env.example
new file mode 100644
index 000000000..7d6a1dedc
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/.env.example
@@ -0,0 +1,2 @@
+# To create or update a token visit https://envio.dev/app/api-tokens
+ENVIO_API_TOKEN="<YOUR-API-TOKEN>"
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/shared/.gitignore b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/.gitignore
new file mode 100644
index 000000000..07b74f471
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/.gitignore
@@ -0,0 +1,35 @@
+*.exe
+*.obj
+*.out
+*.compile
+*.native
+*.byte
+*.cmo
+*.annot
+*.cmi
+*.cmx
+*.cmt
+*.cmti
+*.cma
+*.a
+*.cmxa
+*.obj
+*~
+*.annot
+*.cmj
+*.bak
+lib/*
+*.mlast
+*.mliast
+.vscode
+.merlin
+.bsb.lock
+node_modules/
+build/
+benchmarks/
+artifacts
+cache
+*.res.js
+*.res.mjs
+generated
+.env
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/shared/README.md b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/README.md
new file mode 100644
index 000000000..4a90a0e51
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/README.md
@@ -0,0 +1,45 @@
+# Wildcard Indexing Template
+
+_For a complete guide to all [Envio](https://envio.dev) indexer features, visit the [documentation website](https://docs.envio.dev)._
+
+With **HyperIndex**, developers can enable **wildcard indexing**, allowing them to index events from **any contract** that matches a given event signature.
+This is especially useful when working with contracts that follow common standards like **ERC20**, **ERC721**, or **ERC1155**.
+
+You can learn more about wildcard indexing in the documentation: [https://docs.envio.dev/docs/HyperIndex/wildcard-indexing](https://docs.envio.dev/docs/HyperIndex/wildcard-indexing)
+
+To enable wildcard indexing, simply pass `wildcard: true` in the handler configuration:
+
+```ts
+ERC20.Transfer.handler(
+    async ({ event, context }) => {
+        // ...your handler logic
+    },
+    { wildcard: true }
+);
+```
+
+## Prerequisites
+
+Before running the indexer locally, make sure you have the following installed:
+
+-   **[Node.js 18+](https://nodejs.org/en/download/)**
+-   **[pnpm](https://pnpm.io/installation)**
+-   **[Docker Desktop](https://www.docker.com/products/docker-desktop/)**
+
+## Running the Indexer
+
+Add your Envio API key to the .env file, then start the indexer:
+
+```bash
+pnpm dev
+```
+
+If you make changes to `config.yaml` or `schema.graphql`, regenerate the type files:
+
+```bash
+pnpm codegen
+```
+
+## GraphQL Playground
+
+While indexer is running, visit the Envio Console([https://envio.dev/console](https://envio.dev/console)) to open the GraphQL Playground and query your indexed data.
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/shared/schema.graphql b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/schema.graphql
new file mode 100644
index 000000000..6bc854a1c
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/shared/schema.graphql
@@ -0,0 +1,12 @@
+type Transfer {
+  # id is combination of chain id, block number, and log index 
+  id: ID!
+  # amount is the amount of tokens transferred
+  amount: BigInt!
+  # from is the account that sent the tokens
+  from: String!
+  # to is the account that received the tokens
+  to: String!
+  # contract is the token contract address
+  contract: String!
+}
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/config.yaml b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/config.yaml
new file mode 100644
index 000000000..50e462964
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/config.yaml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=./node_modules/envio/evm.schema.json
+name: Wildcard Indexing
+description: Index all events matching a specified event signature without requiring the contract address
+networks:
+    - id: 1 # Ethereum Mainnet
+      start_block: 23480542
+      contracts:
+          - name: ERC20
+            handler: src/EventHandlers.ts
+            events:
+                - event: "Transfer(address indexed from, address indexed to, uint256 value)"
+
+# https://docs.envio.dev/docs/HyperIndex/multichain-indexing#unordered-multichain-mode
+unordered_multichain_mode: true
+preload_handlers: true
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/src/EventHandlers.ts b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/src/EventHandlers.ts
new file mode 100644
index 000000000..18e6d346b
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/src/EventHandlers.ts
@@ -0,0 +1,14 @@
+import { ERC20 } from "generated";
+
+ERC20.Transfer.handler(
+  async ({ event, context }) => {
+    context.Transfer.set({
+      id: `${event.chainId}_${event.block.number}_${event.logIndex}`,
+      amount: event.params.value,
+      from: event.params.from,
+      to: event.params.to,
+      contract: event.srcAddress,
+    });
+  },
+  { wildcard: true },
+);
\ No newline at end of file
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/test/test.ts b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/test/test.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/tsconfig.json b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/tsconfig.json
new file mode 100644
index 000000000..230241339
--- /dev/null
+++ b/codegenerator/cli/templates/static/wildcard_indexing_template/typescript/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2020", //required for use with BigInt types
+    "lib": [
+      "es2020"
+    ],
+    "allowJs": true,
+    "checkJs": false,
+    "outDir": "build",
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src",
+    "test"
+  ]
+}