diff --git a/schema.graphql b/schema.graphql
index f992a32..0d7689c 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -145,7 +145,7 @@ type Pool @entity {
     "publisher market fee value"
     publishMarketSwapFee: BigDecimal! 
     "publisher market fee total amount"             
-    publishMarketSwapFeeAmount: BigDecimal   
+    publishMarketSwapFeeAmount: BigDecimal!   
 
     "Liquidty provider fee value"             
     liquidityProviderSwapFee: BigDecimal   
diff --git a/src/mappings/pool.ts b/src/mappings/pool.ts
index 8ed7ea7..ea8598d 100644
--- a/src/mappings/pool.ts
+++ b/src/mappings/pool.ts
@@ -239,6 +239,7 @@ export function handleSetup(event: LOG_SETUP): void {
   pool.block = event.block.number.toI32()
   pool.symbol = datatoken.symbol
   pool.name = datatoken.name
+  pool.cap = datatoken.cap
   pool.save()
   poolTx.save()