diff --git a/package-lock.json b/package-lock.json
index 6aabaf4..3dc62e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.51",
+  "version": "0.20.36-rc103",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@orionprotocol/sdk",
-      "version": "0.20.51",
+      "version": "0.20.36-rc103",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 8958aad..a40345b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orionprotocol/sdk",
-  "version": "0.20.51",
+  "version": "0.20.36-rc103",
   "description": "Orion Protocol SDK",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
diff --git a/src/Orion/index.ts b/src/Orion/index.ts
index 649b293..02ccd5c 100644
--- a/src/Orion/index.ts
+++ b/src/Orion/index.ts
@@ -59,7 +59,7 @@ export default class Orion {
                 api: networkConfig.api + networkConfig.services.priceFeed.all,
               },
               indexer: {
-                api: networkConfig.api + networkConfig.services.indexer.http,
+                api: networkConfig.api + networkConfig.services.indexer?.http,
               }
             },
           };
diff --git a/src/Unit/index.ts b/src/Unit/index.ts
index c77bf1c..33badc5 100644
--- a/src/Unit/index.ts
+++ b/src/Unit/index.ts
@@ -1,16 +1,16 @@
 import { JsonRpcProvider } from 'ethers';
-import { Aggregator } from '../services/Aggregator/index.js';
-import { BlockchainService } from '../services/BlockchainService/index.js';
-import { PriceFeed } from '../services/PriceFeed/index.js';
+import { Aggregator } from '../services/Aggregator';
+import { BlockchainService } from '../services/BlockchainService';
+import { PriceFeed } from '../services/PriceFeed';
 import type {
   KnownEnv,
   SupportedChainId,
   VerboseUnitConfig,
 } from '../types.js';
 import Exchange from './Exchange/index.js';
-import { chains, envs } from '../config/index.js';
+import { chains, envs } from '../config';
 import type { networkCodes } from '../constants/index.js';
-import { IndexerService } from '../services/Indexer/index.js';
+import { IndexerService } from '../services/Indexer';
 
 type KnownConfig = {
   env: KnownEnv
@@ -26,7 +26,7 @@ export default class Unit {
 
   public readonly blockchainService: BlockchainService;
 
-  public readonly indexer: IndexerService;
+  public readonly indexer: IndexerService | undefined;
 
   public readonly aggregator: Aggregator;
 
@@ -83,7 +83,7 @@ export default class Unit {
             api: networkConfig.api + networkConfig.services.priceFeed.all,
           },
           indexer: {
-            api: networkConfig.api + networkConfig.services.indexer.http,
+            api: networkConfig.api + networkConfig.services.indexer?.http,
           },
         },
       };
@@ -106,10 +106,12 @@ export default class Unit {
       this.config.services.blockchainService.http,
       this.config.basicAuth
     );
-    this.indexer = new IndexerService(
-      this.config.services.indexer.api,
-      intNetwork
-    );
+    this.indexer = this.config.services.indexer
+      ? new IndexerService(
+        this.config.services.indexer.api,
+        intNetwork
+      )
+      : undefined;
     this.aggregator = new Aggregator(
       this.config.services.aggregator.http,
       this.config.services.aggregator.ws,
diff --git a/src/config/schemas/pureEnvSchema.ts b/src/config/schemas/pureEnvSchema.ts
index ca5bb3e..642dd0b 100644
--- a/src/config/schemas/pureEnvSchema.ts
+++ b/src/config/schemas/pureEnvSchema.ts
@@ -16,7 +16,7 @@ export const pureEnvNetworksSchema = z.object({
     }),
     indexer: z.object({
       http: z.string(),
-    }),
+    }).optional(),
   }),
   rpc: z.string().optional(),
   liquidityMigratorAddress: z.string().optional(),
diff --git a/src/types.ts b/src/types.ts
index dcc0324..b5f0330 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -262,12 +262,12 @@ export type VerboseUnitConfig = {
       // http://10.23.5.11:3003/,
       // https://price-feed:3003/
     }
-    indexer: {
+    indexer?: {
       api: string
       // For example:
       // http://localhost:3004/,
       // http://
-    }
+    } | undefined
   }
   basicAuth?: BasicAuthCredentials
 }