diff --git a/schema.graphql b/schema.graphql
index 1de9135..2530d4d 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -128,29 +128,14 @@ type Pool @entity {
     datatokenLiquidity: BigDecimal!
     datatokenWeight: BigDecimal!
 
-    "pool Fee percent, fee goes to all liquidity providers : SWAP, JOIN , EXIT"
-    poolFee: BigDecimal! 
+    "publisher market fee   : SWAP, JOIN , EXIT"
+    marketSwapFee: BigDecimal! 
+
+    "liquidity provider fee"
+    liquidityProviderFee: BigDecimal!
 
     "OPF Fee percent, fee that goes to Ocean Protocol Foundation : SWAP"                                    
-    opfFee: BigDecimal!   
-
-    "market fee percent, fee that goes to the market where the pool was created : SWAP"                                  
-    marketFee: BigDecimal!     
-
-    "actual value of fee collected in both tokens"                             
-    totalPoolFee: [TokenValuePair!]!  
-
-    "actual value of fee collected in both tokens"                          
-    totalOpfFee: [TokenValuePair!]!   
-
-    "actual value of fee collected in both tokens"                          
-    totalMarketFee: [TokenValuePair!]!                            
-
-    "fee after collection =  totalFee - colectedFee"
-    availableOpfFee: [TokenValuePair!]!     
-
-    "fee after collection totalFee - colectedFee"                      
-    availableMarketFee: [TokenValuePair!]!                        
+    opcFee: BigDecimal!           
 
     "total pool token shares"                           
     totalShares: BigDecimal!   
@@ -211,15 +196,6 @@ type PoolTransaction @entity {
   "number of shares transfered"
   sharesTransferAmount: BigDecimal!                           
  
-  "pool fee value, fee goes to all liquidity providers : SWAP, JOIN , EXIT"
-  poolFee: BigDecimal!     
-
-  "OPF Fee value, fee that goes to Ocean Protocol Foundation : SWAP"                                  
-  opfFee: BigDecimal!        
-
-  "market fee value, fee that goes to the publishing market"                                
-  marketFee: BigDecimal!  
-
   "block time when pool was created"
   timestamp: Int!      
   "pool creation transaction id"                            
@@ -312,7 +288,9 @@ type FixedRateExchange @entity {
   "if the owner allowes the fre to mint"
   withMint: Boolean  
   "if the fre has the minter role on the datatoken"                                        
-  isMinter: Boolean                                          
+  isMinter: Boolean             
+
+  marketSwapFee: BigDecimal!
 
   updates: [FixedRateExchangeUpdate!] @derivedFrom(field: "exchangeId")
   swaps: [FixedRateExchangeSwap!] @derivedFrom(field: "exchangeId")