diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots
index 3c6ece1ca..1afba7063 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - ERC4626 - BatchRouter] swapExactIn - with buffer liquidity - warm slots	
@@ -1 +1 @@
-245.1k
\ No newline at end of file
+245.0k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard - BatchRouter] swap exact in with one token and fees - cold slots
index cf1fe3b12..850b54988 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-194.6k
\ No newline at end of file
+194.5k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - cold slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - cold slots
index 34e80eef2..68b670a11 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - cold slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-178.9k
\ No newline at end of file
+178.8k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - warm slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - warm slots
index 28fbaf434..77bc6d810 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - warm slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - Standard] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-165.0k
\ No newline at end of file
+164.9k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD
index 4aa3cb8e1..722192bb8 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD	
@@ -1 +1 @@
-558.7k
\ No newline at end of file
+558.6k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - cold slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - cold slots
index 4c4616edc..5b0408bcc 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - cold slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate - BatchRouter] swap exact in with one token and fees - cold slots	
@@ -1 +1 @@
-227.7k
\ No newline at end of file
+227.6k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - cold slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - cold slots
index 6a6d4e231..11eae2457 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - cold slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - cold slots	
@@ -1 +1 @@
-212.0k
\ No newline at end of file
+211.9k
\ No newline at end of file
diff --git a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - warm slots b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - warm slots
index bba55110e..9f03a77e5 100644
--- a/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - warm slots	
+++ b/pkg/pool-stable/test/gas/.hardhat-snapshots/[StablePool - WithRate] swap single token exact in with fees - warm slots	
@@ -1 +1 @@
-181.0k
\ No newline at end of file
+180.9k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots
index 2c0adaeb7..5db571426 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactIn - no buffer liquidity - warm slots	
@@ -1 +1 @@
-298.5k
\ No newline at end of file
+298.6k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots
index 28770a155..9a97f9133 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - ERC4626 - BatchRouter] swapExactOut - no buffer liquidity - warm slots	
@@ -1 +1 @@
-320.9k
\ No newline at end of file
+321.0k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize with ETH b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize with ETH
index 6afcf8ec2..13e58083b 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize with ETH	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - Standard] initialize with ETH	
@@ -1 +1 @@
-348.9k
\ No newline at end of file
+348.8k
\ No newline at end of file
diff --git a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots
index a5dc1053f..04c51970a 100644
--- a/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots	
+++ b/pkg/pool-weighted/test/gas/.hardhat-snapshots/[WeightedPool - WithRate - BatchRouter] remove liquidity using swapExactIn - warm slots	
@@ -1 +1 @@
-198.3k
\ No newline at end of file
+198.2k
\ No newline at end of file
diff --git a/pkg/vault/test/.contract-sizes/CompositeLiquidityRouter b/pkg/vault/test/.contract-sizes/CompositeLiquidityRouter
index c471c89e0..c5c2d49d6 100644
--- a/pkg/vault/test/.contract-sizes/CompositeLiquidityRouter
+++ b/pkg/vault/test/.contract-sizes/CompositeLiquidityRouter
@@ -1,2 +1,2 @@
-Bytecode	21.675
-InitCode	23.493
\ No newline at end of file
+Bytecode	21.554
+InitCode	23.372
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA
index 655a05125..d43e23baf 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA	
@@ -1 +1 @@
-508.4k
\ No newline at end of file
+508.5k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD
index 32bdf3000..107780d07 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMock - WithNestedPool - BatchRouter] swap exact in - tokenA-tokenD	
@@ -1 +1 @@
-514.0k
\ No newline at end of file
+514.1k
\ No newline at end of file
diff --git a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA
index 05592e4a8..83ca925e3 100644
--- a/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA	
+++ b/pkg/vault/test/gas/.hardhat-snapshots/[PoolMockWithHooks - WithNestedPool - BatchRouter] swap exact in - reverse - tokenD-tokenA	
@@ -1 +1 @@
-558.9k
\ No newline at end of file
+559.0k
\ No newline at end of file