diff --git a/.gas-snapshot b/.gas-snapshot
index f82a850..22f2a6e 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,69 +1,65 @@
-QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66374119, ~: 74946988)
-QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65024784, ~: 74761739)
+QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66759099, ~: 75010823)
+QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66008847, ~: 75083165)
 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, μ: 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:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68389670, ~: 68389600)
+QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 27023, ~: 27087)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 71010550, ~: 79636764)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69665266, ~: 79403270)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69695230, ~: 79434870)
+QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 65982456, ~: 75054423)
+QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 66016563, ~: 75089173)
+QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 65974048, ~: 75046134)
+QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 65985579, ~: 75056017)
+QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 106133347, ~: 115866805)
 QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10995)
-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:testClearRoute() (gas: 50941)
+ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 151792)
+ReservoirPriceOracleTest:testDesignatePair() (gas: 29113)
+ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21111)
+ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17531)
+ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30729)
 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_BaseIsVault(uint256) (runs: 256, μ: 417472, ~: 417233)
+ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10350769)
+ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 37319, ~: 37435)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 113387)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 113709)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 125327)
+ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20831)
+ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15946)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5327411, ~: 5327435)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10492968, ~: 10493010)
 ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8941, ~: 8941)
-ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38357)
+ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38312)
 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:testGetQuotes(uint256,uint256) (runs: 256, μ: 32724, ~: 32836)
+ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 11003)
+ReservoirPriceOracleTest:testSetRoute() (gas: 58196)
+ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 17964)
+ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 17593)
+ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 193280)
+ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 12081)
+ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 160942)
+ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 12072)
 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: 204244)
+ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15310)
+ReservoirPriceOracleTest:testUpdatePriceDeviationThreshold(uint256) (runs: 256, μ: 21306, ~: 21063)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold() (gas: 213594)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_InsufficientReward(uint256) (runs: 256, μ: 209575, ~: 209653)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_ZeroRecipient() (gas: 195472)
+ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 203166)
+ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15867838)
+ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5350485)
+ReservoirPriceOracleTest:testUpdatePrice_WithinThreshold() (gas: 204011)
 ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19011)
-ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10984)
-ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21696, ~: 21784)
-ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17822, ~: 18120)
-ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30032, ~: 29787)
+ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10962)
+ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21723, ~: 21806)
+ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17861, ~: 18164)
+ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30004, ~: 29765)
 RoutesLibTest:testGetDecimalDifference() (gas: 3974)
 RoutesLibTest:testIsCompositeRoute() (gas: 4341)
 RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 7786, ~: 7555)