diff --git a/.gas-snapshot b/.gas-snapshot
index d48a456..f82a850 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,71 +1,69 @@
-QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66680532, ~: 75107672)
-QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65178546, ~: 75238528)
+QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66374119, ~: 74946988)
+QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65024784, ~: 74761739)
 QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056945756)
 QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80327, ~: 80360)
 QueryProcessorTest:testGetInstantValue() (gas: 124248)
 QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19397, ~: 19397)
-QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68389663, ~: 68389600)
-QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 27027, ~: 27087)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 72569441, ~: 82408620)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68439350, ~: 79368830)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68469161, ~: 79400430)
-QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 65152191, ~: 75209746)
-QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 65186262, ~: 75244536)
-QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 65143780, ~: 75201457)
-QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 65155327, ~: 75211341)
-QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 104921242, ~: 114642503)
+QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68389681, ~: 68389600)
+QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 27031, ~: 27087)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 69123189, ~: 79026739)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68973683, ~: 78719523)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69003585, ~: 78751123)
+QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 64998487, ~: 74732983)
+QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 65032452, ~: 74767747)
+QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 64990066, ~: 74724694)
+QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 65001577, ~: 74734577)
+QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 106380782, ~: 115337944)
 QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10995)
-ReservoirPriceOracleTest:testClearRoute() (gas: 50974)
-ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 151907)
-ReservoirPriceOracleTest:testDesignatePair() (gas: 29091)
-ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21111)
-ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17531)
-ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30729)
-ReservoirPriceOracleTest:testGasBountyAvailable(uint256) (runs: 256, μ: 9929, ~: 9925)
-ReservoirPriceOracleTest:testGasBountyAvailable_Zero() (gas: 8961)
-ReservoirPriceOracleTest:testGetLatest(uint32) (runs: 256, μ: 92675, ~: 92614)
-ReservoirPriceOracleTest:testGetLatest_Inverted() (gas: 96786)
-ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 35190, ~: 35302)
-ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12963)
-ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 417427, ~: 417188)
-ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10350840)
-ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 37300, ~: 37473)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 113391)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 113646)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 125259)
-ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20875)
-ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15902)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5327401, ~: 5327488)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10492876, ~: 10492862)
-ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8963, ~: 8963)
-ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38312)
-ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 38147)
-ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 32679, ~: 32791)
-ReservoirPriceOracleTest:testGetTimeWeightedAverage() (gas: 141765)
-ReservoirPriceOracleTest:testGetTimeWeightedAverage_Inverted() (gas: 120958)
-ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 10938)
-ReservoirPriceOracleTest:testSetRoute() (gas: 58216)
-ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 17990)
-ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 17619)
-ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 193395)
-ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 12102)
-ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 160967)
-ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 12115)
-ReservoirPriceOracleTest:testUndesignatePair() (gas: 30257)
-ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15288)
-ReservoirPriceOracleTest:testUpdatePriceDeviationThreshold(uint256) (runs: 256, μ: 21328, ~: 21085)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold() (gas: 213669)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_InsufficientReward(uint256) (runs: 256, μ: 209788, ~: 210004)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_ZeroRecipient() (gas: 195593)
-ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 203220)
-ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15867847)
+ReservoirPriceOracleTest:testClearRoute() (gas: 50958)
+ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 151797)
+ReservoirPriceOracleTest:testDesignatePair() (gas: 29069)
+ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21089)
+ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17509)
+ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30663)
+ReservoirPriceOracleTest:testGetLatest(uint32) (runs: 256, μ: 92710, ~: 92635)
+ReservoirPriceOracleTest:testGetLatest_Inverted() (gas: 96850)
+ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 35191, ~: 35303)
+ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12941)
+ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 417478, ~: 417233)
+ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10350760)
+ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 37346, ~: 37518)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 113370)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 113692)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 125310)
+ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20787)
+ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15880)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5327385, ~: 5327443)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10492824, ~: 10492848)
+ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8941, ~: 8941)
+ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38357)
+ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 38148)
+ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 32746, ~: 32858)
+ReservoirPriceOracleTest:testGetTimeWeightedAverage() (gas: 141788)
+ReservoirPriceOracleTest:testGetTimeWeightedAverage_Inverted() (gas: 120914)
+ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 11048)
+ReservoirPriceOracleTest:testSetRoute() (gas: 58195)
+ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 17946)
+ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 17575)
+ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 193263)
+ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 12080)
+ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 160924)
+ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 12093)
+ReservoirPriceOracleTest:testUndesignatePair() (gas: 30279)
+ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15354)
+ReservoirPriceOracleTest:testUpdatePriceDeviationThreshold(uint256) (runs: 256, μ: 21373, ~: 21130)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold() (gas: 213849)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_InsufficientReward(uint256) (runs: 256, μ: 209855, ~: 210071)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_ZeroRecipient() (gas: 195682)
+ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 203399)
+ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15867896)
 ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5350717)
-ReservoirPriceOracleTest:testUpdatePrice_WithinThreshold() (gas: 204109)
-ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19033)
+ReservoirPriceOracleTest:testUpdatePrice_WithinThreshold() (gas: 204244)
+ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19011)
 ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10984)
-ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21751, ~: 21828)
-ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17852, ~: 18164)
-ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 29936, ~: 29697)
+ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21696, ~: 21784)
+ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17822, ~: 18120)
+ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30032, ~: 29787)
 RoutesLibTest:testGetDecimalDifference() (gas: 3974)
 RoutesLibTest:testIsCompositeRoute() (gas: 4341)
 RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 7786, ~: 7555)