diff --git a/schema.graphql b/schema.graphql
index 9fa556d..ff6a925 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -8,9 +8,6 @@ type Pool @entity {
   blockTimestamp: BigInt!
   transactionHash: Bytes!
 
-  tokensList: [Bytes!]!
-  rateProvidersList: [Bytes!]!
-
   tokens: [PoolToken!] @derivedFrom(field: "pool")
   rateProviders: [PoolToken!] @derivedFrom(field: "pool")
 }
diff --git a/src/mappings/vault.ts b/src/mappings/vault.ts
index ef409f6..b59300f 100644
--- a/src/mappings/vault.ts
+++ b/src/mappings/vault.ts
@@ -21,8 +21,6 @@ export function handlePoolRegistered(event: PoolRegisteredEvent): void {
 
   let pool = new Pool(poolAddress)
   pool.factory = event.params.factory
-  pool.tokensList = changetype<Bytes[]>(event.params.tokens)
-  pool.rateProvidersList = changetype<Bytes[]>(event.params.rateProviders)
   pool.pauseWindowEndTime = event.params.pauseWindowEndTime
   pool.pauseManager = event.params.pauseManager
   pool.totalShares = ZERO_BI
@@ -33,10 +31,10 @@ export function handlePoolRegistered(event: PoolRegisteredEvent): void {
 
   pool.save();
 
-  for (let i: i32 = 0; i < pool.tokensList.length; i++) {
-    let tokenAddress = event.params.tokens[i];
-    let rateProviderAddress = event.params.rateProviders[i];
+  for (let i: i32 = 0; i < event.params.tokenConfig.length; i++) {
+    let tokenAddress = event.params.tokenConfig[i].token;
     createPoolToken(poolAddress, tokenAddress);
+    let rateProviderAddress = event.params.tokenConfig[i].rateProvider;
     createRateProvider(poolAddress, tokenAddress, rateProviderAddress);
   }
 
diff --git a/subgraph.yaml b/subgraph.yaml
index 63de4aa..26cc01f 100644
--- a/subgraph.yaml
+++ b/subgraph.yaml
@@ -25,7 +25,7 @@ dataSources:
       eventHandlers:
         - event: PoolBalanceChanged(indexed address,indexed address,address[],int256[])
           handler: handlePoolBalanceChanged
-        - event: PoolRegistered(indexed address,indexed address,address[],address[],uint256,address,(bool,bool,bool,bool,bool,bool,bool,bool),(bool,bool))
+        - event: PoolRegistered(indexed address,indexed address,(address,uint8,address,bool)[],uint256,address,(bool,bool,bool,bool,bool,bool,bool,bool),(bool,bool))
           handler: handlePoolRegistered
         - event: Swap(indexed address,indexed address,indexed address,uint256,uint256,uint256)
           handler: handleSwap