diff --git a/substreams/ethereum-curve/src/pool_factories.rs b/substreams/ethereum-curve/src/pool_factories.rs
index ace890f..caa088a 100644
--- a/substreams/ethereum-curve/src/pool_factories.rs
+++ b/substreams/ethereum-curve/src/pool_factories.rs
@@ -247,7 +247,7 @@ pub fn address_map(
                         index: tx.index.into(),
                     }),
                     tokens: vec![pool_added.coin, lp_token],
-                    contracts: vec![component_id.into(), add_pool.base_pool],
+                    contracts: vec![component_id.into()],
                     static_att: vec![
                         Attribute {
                             name: "pool_type".into(),
@@ -269,6 +269,13 @@ pub fn address_map(
                             value: address_to_bytes_with_0x(&META_POOL_FACTORY),
                             change: ChangeType::Creation.into(),
                         },
+                        Attribute {
+                            name: "base_pool".into(),
+                            value: address_to_bytes_with_0x(
+                                &add_pool.base_pool.try_into().unwrap(),
+                            ),
+                            change: ChangeType::Creation.into(),
+                        },
                     ],
                     change: ChangeType::Creation.into(),
                     protocol_type: Some(ProtocolType {
@@ -315,7 +322,7 @@ pub fn address_map(
                         index: tx.index.into(),
                     }),
                     tokens: vec![pool_added.coin, lp_token],
-                    contracts: vec![component_id.into(), add_pool.base_pool],
+                    contracts: vec![component_id.into()],
                     static_att: vec![
                         Attribute {
                             name: "pool_type".into(),
@@ -337,6 +344,13 @@ pub fn address_map(
                             value: address_to_bytes_with_0x(&META_POOL_FACTORY),
                             change: ChangeType::Creation.into(),
                         },
+                        Attribute {
+                            name: "base_pool".into(),
+                            value: address_to_bytes_with_0x(
+                                &add_pool.base_pool.try_into().unwrap(),
+                            ),
+                            change: ChangeType::Creation.into(),
+                        },
                     ],
                     change: ChangeType::Creation.into(),
                     protocol_type: Some(ProtocolType {
@@ -416,7 +430,7 @@ pub fn address_map(
                         index: tx.index.into(),
                     }),
                     tokens: vec![pool_added.coin, lp_token],
-                    contracts: vec![component_id.into(), pool_added.base_pool],
+                    contracts: vec![component_id.into()],
                     static_att: vec![
                         Attribute {
                             name: "pool_type".into(),
@@ -438,6 +452,13 @@ pub fn address_map(
                             value: address_to_bytes_with_0x(&CRYPTO_SWAP_NG_FACTORY),
                             change: ChangeType::Creation.into(),
                         },
+                        Attribute {
+                            name: "base_pool".into(),
+                            value: address_to_bytes_with_0x(
+                                &pool_added.base_pool.try_into().unwrap(),
+                            ),
+                            change: ChangeType::Creation.into(),
+                        },
                     ],
                     change: ChangeType::Creation.into(),
                     protocol_type: Some(ProtocolType {
@@ -614,7 +635,7 @@ pub fn address_map(
                         index: tx.index.into(),
                     }),
                     tokens: vec![pool_added.coin, lp_token],
-                    contracts: vec![component_id.into(), pool_added.base_pool],
+                    contracts: vec![component_id.into()],
                     static_att: vec![
                         Attribute {
                             name: "pool_type".into(),
@@ -636,6 +657,13 @@ pub fn address_map(
                             value: address_to_bytes_with_0x(&STABLESWAP_FACTORY),
                             change: ChangeType::Creation.into(),
                         },
+                        Attribute {
+                            name: "base_pool".into(),
+                            value: address_to_bytes_with_0x(
+                                &pool_added.base_pool.try_into().unwrap(),
+                            ),
+                            change: ChangeType::Creation.into(),
+                        },
                     ],
                     change: ChangeType::Creation.into(),
                     protocol_type: Some(ProtocolType {