diff --git a/subgraph.template.yaml b/subgraph.template.yaml
index 8a1567f..f1fdb55 100644
--- a/subgraph.template.yaml
+++ b/subgraph.template.yaml
@@ -208,284 +208,6 @@ templates:
         - event: TokenCollected(indexed bytes32,indexed address,indexed address,uint256)
           handler: handleTokenCollected
 
-dataSources:
-  - kind: ethereum/contract
-    name: ERC721Factory
-    network: __NETWORK__
-    source:
-      address: __ERC721FACTORYADDRESS__
-      abi: ERC721Factory
-      startBlock: __STARTBLOCK__
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/erc721Factory.ts
-      entities:
-        - ERC721Factory
-      abis:
-        - name: ERC721Template
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json
-        - name: ERC20Template
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json
-        - name: ERC721Factory
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/ERC721Factory.sol/ERC721Factory.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-      eventHandlers:
-        - event: NFTCreated(address,indexed address,string,indexed address,string,string,bool,indexed address)
-          handler: handleNftCreated
-        - event: TokenCreated(indexed address,indexed address,string,string,uint256,address)
-          handler: handleNewToken
-        - event: Template721Added(indexed address,indexed uint256)
-          handler: handleNew721Template
-        - event: Template20Added(indexed address,indexed uint256)
-          handler: handleNew20Template
-
-  - kind: ethereum/contract
-    name: FactoryRouter
-    network: __NETWORK__
-    source:
-      address: __FACTORYROUTERADDRESS__
-      abi: FactoryRouter
-      startBlock: __STARTBLOCK__
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/factoryRouter.ts
-      entities:
-        - FactoryRouter
-      abis:
-        - name: FactoryRouter
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/FactoryRouter.sol/FactoryRouter.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-      eventHandlers:
-        - event: TokenAdded(indexed address,indexed address)
-          handler: handleTokenAdded
-        - event: TokenRemoved(indexed address,indexed address)
-          handler: handleTokenRemoved
-        - event: OPCFeeChanged(indexed address,uint256,uint256,uint256,uint256)
-          handler: handleOPCFeeChanged
-        - event: FixedRateContractAdded(indexed address,indexed address)
-          handler: handleFixedRateContractAdded
-        - event: FixedRateContractRemoved(indexed address,indexed address)
-          handler: handleFixedRateContractRemoved
-        - event: DispenserContractAdded(indexed address,indexed address)
-          handler: handleDispenserContractAdded
-        - event: DispenserContractRemoved(indexed address,indexed address)
-          handler: handleDispenserContractRemoved
-specVersion: 0.0.3
-description: Ocean provides data sharing through IDOs
-repository: https://github.com/oceanprotocol/ocean-subgraph
-schema:
-  file: ./schema.graphql
-templates:
-  - name: ERC20Template
-    kind: ethereum/contract
-    network: __NETWORK__
-    source:
-      abi: ERC20Template
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/erc20Templates.ts
-      entities:
-        - ERC20Template
-      abis:
-        - name: ERC20Template
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template.sol/ERC20Template.json
-        - name: ERC20TemplateEnterprise
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC20TemplateEnterprise.sol/ERC20TemplateEnterprise.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-        - name: ERC20Roles
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/utils/ERC20Roles.sol/ERC20Roles.json
-      eventHandlers:
-        - event: OrderStarted(indexed address,address,uint256,uint256,uint256,indexed address,uint256)
-          handler: handleOrderStarted
-          receipt: true
-        - event: OrderReused(bytes32,address,uint256,uint256)
-          handler: handlerOrderReused
-          receipt: true
-        - event: NewPaymentCollector(indexed address,indexed address,uint256,uint256)
-          handler: handleNewPaymentCollector
-        - event: PublishMarketFee(indexed address,indexed address,uint256)
-          handler: handlePublishMarketFee
-        - event: PublishMarketFeeChanged(address,address,address,uint256)
-          handler: handlePublishMarketFeeChanged
-        - event: ConsumeMarketFee(indexed address,indexed address,uint256)
-          handler: handleConsumeMarketFee
-        - event: AddedMinter(indexed address,indexed address,uint256,uint256)
-          handler: handleAddedMinter
-        - event: AddedPaymentManager(indexed address,indexed address,uint256,uint256)
-          handler: handleAddedPaymentManager
-        - event: RemovedMinter(indexed address,indexed address,uint256,uint256)
-          handler: handleRemovedMinter
-        - event: RemovedPaymentManager(indexed address,indexed address,uint256,uint256)
-          handler: handleRemovedPaymentManager
-        - event: CleanedPermissions(indexed address,uint256,uint256)
-          handler: handleCleanedPermissions
-        - event: ProviderFee(indexed address,indexed address,uint256,bytes,uint8,bytes32,bytes32,uint256)
-          handler: handleProviderFee
-          receipt: true
-
-  - name: ERC20Template3
-    kind: ethereum/contract
-    network: __NETWORK__
-    source:
-      abi: ERC20Template3
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/erc20Template3.ts
-      entities:
-        - ERC20Template3
-      abis:
-        - name: ERC20Template3
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC20Template3.sol/ERC20Template3.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-        - name: ERC20Roles
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/utils/ERC20Roles.sol/ERC20Roles.json
-      eventHandlers:
-        - event: PredictionSubmitted(indexed address,indexed uint256,uint256)
-          handler: handlePredictionSubmitted
-        - event: PredictionPayout(indexed address,indexed uint256,uint256,uint256,bool,bool,uint256,uint8)
-          handler: handlePredictionPayout
-        - event: NewSubscription(indexed address,uint256,uint256)
-          handler: handleNewSubscription
-        - event: TruevalSubmitted(indexed uint256,bool,uint8,uint256,uint256)
-          handler: handleTruevalSubmitted
-        - event: SettingChanged(uint256,uint256,uint256,address)
-          handler: handleSettingChanged
-        - event: RevenueAdded(uint256,uint256,uint256,uint256,uint256)
-          handler: handleRevenueAdded
-        - event: Paused(bool)
-          handler: handlePaused
-
-  - name: ERC721Template
-    kind: ethereum/contract
-    network: __NETWORK__
-    source:
-      abi: ERC721Template
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/nftUpdate.ts
-      entities:
-        - ERC721Template
-      abis:
-        - name: ERC721Template
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/templates/ERC721Template.sol/ERC721Template.json
-        - name: ERC721RolesAddress
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/utils/ERC721RolesAddress.sol/ERC721RolesAddress.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-      eventHandlers:
-        - event: MetadataCreated(indexed address,uint8,string,bytes,bytes,bytes32,uint256,uint256)
-          handler: handleMetadataCreated
-        - event: MetadataUpdated(indexed address,uint8,string,bytes,bytes,bytes32,uint256,uint256)
-          handler: handleMetadataUpdated
-        - event: MetadataState(indexed address,uint8,uint256,uint256)
-          handler: handleMetadataState
-        - event: TokenURIUpdate(indexed address,string,uint256,uint256,uint256)
-          handler: handleTokenUriUpdate
-        - event: AddedManager(indexed address,indexed address,uint256,uint256)
-          handler: handleAddedManager
-        - event: AddedTo725StoreList(indexed address,indexed address,uint256,uint256)
-          handler: handleAddedTo725StoreList
-        - event: AddedToCreateERC20List(indexed address,indexed address,uint256,uint256)
-          handler: handleAddedToCreateERC20List
-        - event: AddedToMetadataList(indexed address,indexed address,uint256,uint256)
-          handler: handleAddedToMetadataList
-        - event: RemovedFrom725StoreList(indexed address,indexed address,uint256,uint256)
-          handler: handleRemovedFrom725StoreList
-        - event: RemovedFromCreateERC20List(indexed address,indexed address,uint256,uint256)
-          handler: handleRemovedFromCreateERC20List
-        - event: RemovedFromMetadataList(indexed address,indexed address,uint256,uint256)
-          handler: handleRemovedFromMetadataList
-        - event: RemovedManager(indexed address,indexed address,uint256,uint256)
-          handler: handleRemovedManager
-        - event: CleanedPermissions(indexed address,uint256,uint256)
-          handler: handleCleanedPermissions
-        - event: Transfer(indexed address,indexed address,indexed uint256)
-          handler: handleNftTransferred
-        - event: DataChanged(indexed bytes32,bytes)
-          handler: handleNftData
-
-  - name: Dispenser
-    kind: ethereum/contract
-    network: __NETWORK__
-    source:
-      abi: Dispenser
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/dispenser.ts
-      entities:
-        - Dispenser
-      abis:
-        - name: Dispenser
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/dispenser/Dispenser.sol/Dispenser.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-      eventHandlers:
-        - event: DispenserCreated(indexed address,indexed address,uint256,uint256,address)
-          handler: handleNewDispenser
-        - event: DispenserActivated(indexed address)
-          handler: handleActivate
-        - event: DispenserDeactivated(indexed address)
-          handler: handleDeactivate
-        - event: DispenserAllowedSwapperChanged(indexed address,indexed address)
-          handler: handleAllowedSwapperChanged
-        - event: TokensDispensed(indexed address,indexed address,uint256)
-          handler: handleTokensDispensed
-        - event: OwnerWithdrawed(indexed address,indexed address,uint256)
-          handler: handleOwnerWinthdraw
-
-  - name: FixedRateExchange
-    kind: ethereum/contract
-    network: __NETWORK__
-    source:
-      abi: FixedRateExchange
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.7
-      language: wasm/assemblyscript
-      file: ./src/mappings/fixedRateExchange.ts
-      entities:
-        - FixedRateExchange
-      abis:
-        - name: FixedRateExchange
-          file: ./node_modules/@oceanprotocol/contracts/artifacts/contracts/pools/fixedRate/FixedRateExchange.sol/FixedRateExchange.json
-        - name: ERC20
-          file: ./abis/ERC20.json
-      eventHandlers:
-        - event: ExchangeCreated(indexed bytes32,indexed address,indexed address,address,uint256)
-          handler: handleExchangeCreated
-        - event: ExchangeRateChanged(indexed bytes32,indexed address,uint256)
-          handler: handleRateChange
-        - event: ExchangeMintStateChanged(indexed bytes32,indexed address,bool)
-          handler: handleMintStateChanged
-        - event: ExchangeActivated(indexed bytes32,indexed address)
-          handler: handleActivated
-        - event: ExchangeDeactivated(indexed bytes32,indexed address)
-          handler: handleDeactivated
-        - event: ExchangeAllowedSwapperChanged(indexed bytes32,indexed address)
-          handler: handleAllowedSwapperChanged
-        - event: Swapped(indexed bytes32,indexed address,uint256,uint256,address,uint256,uint256,uint256)
-          handler: handleSwap
-        - event: PublishMarketFeeChanged(indexed bytes32,address,address,uint256)
-          handler: handlePublishMarketFeeChanged
-        - event: TokenCollected(indexed bytes32,indexed address,indexed address,uint256)
-          handler: handleTokenCollected
-
 dataSources:
   - kind: ethereum/contract
     name: ERC721Factory