diff --git a/schema.graphql b/schema.graphql
index ff6a925..6cbd3e1 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -1,15 +1,26 @@
+type Vault @entity {
+  id: Bytes!
+  authorizer: Bytes!
+  isPaused: Boolean!
+  protocolSwapFee: BigDecimal!
+  protocolYieldFee: BigDecimal!
+  pools: [Pool!] @derivedFrom(field: "vault")
+}
+
 type Pool @entity {
   id: Bytes!
+  vault: Vault!
   factory: Bytes!
+  address: Bytes!
   totalShares: BigInt!
-  pauseWindowEndTime: BigInt!
   pauseManager: Bytes!
+  pauseWindowEndTime: BigInt!
   blockNumber: BigInt!
   blockTimestamp: BigInt!
   transactionHash: Bytes!
 
   tokens: [PoolToken!] @derivedFrom(field: "pool")
-  rateProviders: [PoolToken!] @derivedFrom(field: "pool")
+  rateProviders: [RateProvider!] @derivedFrom(field: "pool")
 }
 
 type PoolToken @entity {
@@ -17,6 +28,8 @@ type PoolToken @entity {
   pool: Pool!
   address: Bytes!
   balance: BigInt!
+  totalProtocolSwapFee: BigInt!
+  totalProtocolYieldFee: BigInt!
 }
 
 type RateProvider @entity {
@@ -68,12 +81,15 @@ type PoolSnapshot @entity {
   id: ID!
   pool: Pool!
   timestamp: Int!
-  balances: [BigInt!]!
   totalShares: BigInt!
+  balances: [BigInt!]!
+  totalProtocolSwapFees: [BigInt!]!
+  totalProtocolYieldFees: [BigInt!]!
 }
 
 type User @entity {
   id: ID!
   swaps: [Swap!] @derivedFrom(field: "user")
   shares: [PoolShare!] @derivedFrom(field: "user")
+  joinExits: [JoinExit!] @derivedFrom(field: "user")
 }
diff --git a/src/helpers/entities.ts b/src/helpers/entities.ts
index efe923b..3059988 100644
--- a/src/helpers/entities.ts
+++ b/src/helpers/entities.ts
@@ -1,10 +1,24 @@
-import { Address, BigInt } from "@graphprotocol/graph-ts";
-import { Pool, PoolSnapshot, PoolToken, RateProvider } from "../types/schema";
+import { Address, BigInt, Bytes } from "@graphprotocol/graph-ts";
+import { Pool, PoolSnapshot, PoolToken, RateProvider, Vault } from "../types/schema";
 import { PoolShare } from "../types/schema";
-import { ZERO_BI } from "./constants";
+import { ZERO_ADDRESS, ZERO_BD, ZERO_BI } from "./constants";
 
 const DAY = 24 * 60 * 60;
 
+export function getVault(vaultAddress: Bytes): Vault {
+    let vault: Vault | null = Vault.load(vaultAddress);
+    if (vault != null) return vault;
+  
+    vault = new Vault(vaultAddress);
+    vault.isPaused = false;
+    vault.authorizer = ZERO_ADDRESS;
+    vault.protocolSwapFee = ZERO_BD;
+    vault.protocolYieldFee = ZERO_BD;
+    vault.save();
+    
+    return vault;
+  }
+
 export function getPoolShareId(poolAddress: Address, userAddress: Address): string {
     return poolAddress.toHex().concat('-').concat(userAddress.toHex());
 }
@@ -28,14 +42,20 @@ export function createPoolSnapshot(pool: Pool, timestamp: i32): void {
 
     let poolTokens = pool.tokens.load();
     let balances = new Array<BigInt>(poolTokens.length);
+    let totalProtocolSwapFees = new Array<BigInt>(poolTokens.length);
+    let totalProtocolYieldFees = new Array<BigInt>(poolTokens.length);
     for (let i = 0; i < poolTokens.length; i++) {
         balances[i] = poolTokens[i].balance;
+        totalProtocolSwapFees[i] = poolTokens[i].totalProtocolSwapFee;
+        totalProtocolYieldFees[i] = poolTokens[i].totalProtocolYieldFee;
     }
   
     snapshot.pool = poolAddress;
     snapshot.balances = balances;
     snapshot.timestamp = dayTimestamp;
     snapshot.totalShares = pool.totalShares;
+    snapshot.totalProtocolSwapFees = totalProtocolSwapFees;
+    snapshot.totalProtocolYieldFees = totalProtocolYieldFees;
     snapshot.save();
 }
 
@@ -50,11 +70,13 @@ export function createPoolToken(poolAddress: Address, tokenAddress: Address): vo
     poolToken.pool = poolAddress;
     poolToken.address = tokenAddress;
     poolToken.balance = ZERO_BI;
+    poolToken.totalProtocolSwapFee = ZERO_BI;
+    poolToken.totalProtocolYieldFee = ZERO_BI;
     poolToken.save();
 }
 
 export function createRateProvider(poolAddress: Address, tokenAddress: Address, rateProviderAddress: Address): void {
-    let rateProviderId = poolAddress.concat(rateProviderAddress);
+    let rateProviderId = poolAddress.concat(tokenAddress).concat(rateProviderAddress);
     let rateProvider = RateProvider.load(rateProviderId);
 
     if (!rateProvider) {
diff --git a/src/helpers/misc.ts b/src/helpers/misc.ts
index 4c94571..dd3903d 100644
--- a/src/helpers/misc.ts
+++ b/src/helpers/misc.ts
@@ -5,4 +5,17 @@ export function tokenToDecimal(amount: BigInt, decimals: i32): BigDecimal {
       .pow(decimals as u8)
       .toBigDecimal();
     return amount.toBigDecimal().div(scale);
+}
+
+export function scaleDown(num: BigInt, decimals: i32): BigDecimal {
+  return num.divDecimal(BigInt.fromI32(10).pow(u8(decimals)).toBigDecimal());
+}
+
+export function scaleUp(num: BigDecimal, decimals: i32): BigInt {
+  return BigInt.fromString(
+    num
+      .truncate(decimals)
+      .times(BigInt.fromI32(10).pow(u8(decimals)).toBigDecimal())
+      .toString()
+  );
 }
\ No newline at end of file
diff --git a/src/mappings/vault.ts b/src/mappings/vault.ts
index 2467a32..86634f9 100644
--- a/src/mappings/vault.ts
+++ b/src/mappings/vault.ts
@@ -2,6 +2,10 @@ import { BigInt, Bytes, log } from "@graphprotocol/graph-ts"
 import {
   PoolBalanceChanged as PoolBalanceChangedEvent,
   PoolRegistered as PoolRegisteredEvent,
+  ProtocolSwapFeeCharged,
+  ProtocolSwapFeePercentageChanged,
+  ProtocolYieldFeeCharged,
+  ProtocolYieldFeePercentageChanged,
   Swap as SwapEvent,
 } from "../types/Vault/Vault"
 import {
@@ -10,20 +14,24 @@ import {
   JoinExit
 } from "../types/schema"
 import { ZERO_BI } from "../helpers/constants"
-import { createPoolSnapshot, createPoolToken, createRateProvider, loadPoolToken } from "../helpers/entities"
+import { createPoolSnapshot, createPoolToken, createRateProvider, getVault, loadPoolToken } from "../helpers/entities"
+import { scaleDown } from "../helpers/misc"
 
 /************************************
  ******* POOLS REGISTRATIONS ********
  ************************************/
 
 export function handlePoolRegistered(event: PoolRegisteredEvent): void {
-  const poolAddress = event.params.pool;
+  let vault = getVault(event.address);
+  let poolAddress = event.params.pool;
 
-  let pool = new Pool(poolAddress)
-  pool.factory = event.params.factory
-  pool.pauseWindowEndTime = event.params.pauseWindowEndTime
-  pool.pauseManager = event.params.pauseManager
-  pool.totalShares = ZERO_BI
+  let pool = new Pool(poolAddress);
+  pool.vault = vault.id;
+  pool.address = poolAddress;
+  pool.factory = event.params.factory;
+  pool.pauseWindowEndTime = event.params.pauseWindowEndTime;
+  pool.pauseManager = event.params.pauseManager;
+  pool.totalShares = ZERO_BI;
 
   pool.blockNumber = event.block.number
   pool.blockTimestamp = event.block.timestamp
@@ -92,7 +100,9 @@ function handlePoolJoined(event: PoolBalanceChangedEvent): void {
   join.amounts = joinAmounts;
   join.pool = poolAddress;
   join.user = event.params.liquidityProvider.toHex();
+  join.blockNumber = event.block.number;
   join.blockTimestamp = event.block.timestamp;
+  join.transactionHash = transactionHash;
   join.save();
 
   createPoolSnapshot(pool, event.block.timestamp.toI32());
@@ -130,7 +140,9 @@ function handlePoolExited(event: PoolBalanceChangedEvent): void {
   exit.amounts = exitAmounts;
   exit.pool = poolAddress;
   exit.user = event.params.liquidityProvider.toHex();
+  exit.blockNumber = event.block.number;
   exit.blockTimestamp = event.block.timestamp;
+  exit.transactionHash = transactionHash;
   exit.save();
 
   createPoolSnapshot(pool, event.block.timestamp.toI32());
@@ -143,26 +155,78 @@ function handlePoolExited(event: PoolBalanceChangedEvent): void {
 export function handleSwap(event: SwapEvent): void {
   let swap = new Swap(
     event.transaction.hash.concatI32(event.logIndex.toI32())
-  )
+  );
 
-  swap.pool = event.params.pool
-  swap.tokenIn = event.params.tokenIn
-  swap.tokenOut = event.params.tokenOut
-  swap.tokenAmountIn = event.params.amountIn
-  swap.tokenAmountOut = event.params.amountOut
-  swap.swapFeeAmount = event.params.swapFeeAmount
+  swap.pool = event.params.pool;
+  swap.tokenIn = event.params.tokenIn;
+  swap.tokenOut = event.params.tokenOut;
+  swap.tokenAmountIn = event.params.amountIn;
+  swap.tokenAmountOut = event.params.amountOut;
+  swap.swapFeeAmount = event.params.swapFeeAmount;
+  swap.user = event.transaction.from.toHexString();
 
-  swap.blockNumber = event.block.number
-  swap.blockTimestamp = event.block.timestamp
-  swap.transactionHash = event.transaction.hash
+  swap.blockNumber = event.block.number;
+  swap.blockTimestamp = event.block.timestamp;
+  swap.transactionHash = event.transaction.hash;
 
   swap.save();
 
-  let pool = Pool.load(event.params.pool);
+  let poolAddress = event.params.pool;
+
+  let pool = Pool.load(poolAddress);
   if (pool == null) {
-    log.warning('Pool not found in handleSwap: {} {}', [event.params.pool.toHex(), event.transaction.hash.toHex()]);
+    log.warning('Pool not found in handleSwap: {} {}', [poolAddress.toHex(), event.transaction.hash.toHex()]);
     return;
   }
 
+  let tokenInAddress = event.params.tokenIn;
+  let tokenOutAddress = event.params.tokenOut;
+
+  let poolTokenIn = loadPoolToken(poolAddress, tokenInAddress);
+  let poolTokenOut = loadPoolToken(poolAddress, tokenOutAddress);
+  if (poolTokenIn == null || poolTokenOut == null) {
+    log.warning('PoolToken not found in handleSwap: (tokenIn: {}), (tokenOut: {})', [
+      tokenInAddress.toHexString(),
+      tokenOutAddress.toHexString(),
+    ]);
+    return;
+  }
+
+  let newInAmount = poolTokenIn.balance.plus(event.params.amountIn);
+  poolTokenIn.balance = newInAmount;
+  poolTokenIn.save();
+
+  let newOutAmount = poolTokenOut.balance.minus(event.params.amountOut);
+  poolTokenOut.balance = newOutAmount;
+  poolTokenOut.save();
+
   createPoolSnapshot(pool, event.block.timestamp.toI32());
 }
+
+/************************************
+ ********** PROTOCOL FEES ***********
+ ************************************/
+
+ export function handleProtocolSwapFeePercentageChanged(event: ProtocolSwapFeePercentageChanged): void {
+  let vault = getVault(event.address);
+  vault.protocolSwapFee = scaleDown(event.params.swapFeePercentage, 18);
+  vault.save();
+}
+
+export function handleProtocolYieldFeePercentageChanged(event: ProtocolYieldFeePercentageChanged): void {
+  let vault = getVault(event.address);
+  vault.protocolYieldFee = scaleDown(event.params.yieldFeePercentage, 18);
+  vault.save();
+}
+
+export function handleProtocolSwapFeeCharged(event: ProtocolSwapFeeCharged): void {
+  let poolToken = loadPoolToken(event.params.pool, event.params.token);
+  poolToken.totalProtocolSwapFee = poolToken.totalProtocolSwapFee.plus(event.params.amount);
+  poolToken.save();
+}
+
+export function handleProtocolYieldFeeCharged(event: ProtocolYieldFeeCharged): void {
+  let poolToken = loadPoolToken(event.params.pool, event.params.token);
+  poolToken.totalProtocolYieldFee = poolToken.totalProtocolYieldFee.plus(event.params.amount);
+  poolToken.save();
+}