diff --git a/.gas-snapshot b/.gas-snapshot
index ca3359e..39f09f6 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,75 +1,75 @@
-FlagsLibTest:testGetDecimalDifference() (gas: 3974)
-FlagsLibTest:testIsCompositeRoute() (gas: 4341)
-FlagsLibTest:testPackSimplePrice(int8,uint256) (runs: 259, μ: 7799, ~: 7555)
-QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 259, μ: 67557567, ~: 76401709)
-QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 259, μ: 67033233, ~: 76116668)
-QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 8937393461068805977)
-QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 259, μ: 80945, ~: 80974)
-QueryProcessorTest:testGetInstantValue() (gas: 126197)
-QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 259, μ: 19397, ~: 19397)
-QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 259, μ: 69647140, ~: 69647072)
-QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 259, μ: 27034, ~: 27087)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 259, μ: 72319369, ~: 82729762)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 259, μ: 71628429, ~: 81068158)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 259, μ: 71658441, ~: 81099758)
-QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 259, μ: 67006873, ~: 76087503)
-QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 259, μ: 67040913, ~: 76122676)
-QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 259, μ: 66998495, ~: 76079900)
-QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 259, μ: 67009985, ~: 76089440)
-QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 259, μ: 111263283, ~: 119811834)
+QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 67585746, ~: 76007063)
+QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 67051023, ~: 76087612)
+QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056945756)
+QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80325, ~: 80360)
+QueryProcessorTest:testGetInstantValue() (gas: 124248)
+QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19397, ~: 19397)
+QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68389647, ~: 68389600)
+QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 27017, ~: 27087)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 69289018, ~: 79307245)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 70900090, ~: 79224986)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 70930212, ~: 79256586)
+QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 67024575, ~: 76058923)
+QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 67058609, ~: 76093620)
+QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 67016184, ~: 76050634)
+QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 67027596, ~: 76060517)
+QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 101761121, ~: 108597954)
 QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10995)
-ReservoirPriceOracleTest:testClearRoute() (gas: 51595)
-ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 152969)
+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: 259, μ: 9929, ~: 9925)
+ReservoirPriceOracleTest:testGasBountyAvailable(uint256) (runs: 256, μ: 9929, ~: 9925)
 ReservoirPriceOracleTest:testGasBountyAvailable_Zero() (gas: 8961)
-ReservoirPriceOracleTest:testGetLatest(uint32) (runs: 259, μ: 93296, ~: 93228)
-ReservoirPriceOracleTest:testGetLatest_Inverted() (gas: 97400)
-ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 259, μ: 35879, ~: 36002)
+ReservoirPriceOracleTest:testGetLatest(uint32) (runs: 256, μ: 92685, ~: 92614)
+ReservoirPriceOracleTest:testGetLatest_Inverted() (gas: 96786)
+ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 35198, ~: 35302)
 ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12963)
-ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 259, μ: 417780, ~: 417538)
-ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10449568)
-ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 259, μ: 37987, ~: 38050)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 114390)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 114645)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 126519)
-ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20920)
+ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 417430, ~: 417188)
+ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10350840)
+ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 37311, ~: 37474)
+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: 258, μ: 5390914, ~: 5390998)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 258, μ: 10591778, ~: 10591794)
-ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 259, μ: 8963, ~: 8963)
-ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38402)
-ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 38847)
-ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 259, μ: 33018, ~: 33141)
-ReservoirPriceOracleTest:testGetTimeWeightedAverage() (gas: 142993)
-ReservoirPriceOracleTest:testGetTimeWeightedAverage_Inverted() (gas: 122186)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5327381, ~: 5327411)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10492723, ~: 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, μ: 32687, ~: 32791)
+ReservoirPriceOracleTest:testGetTimeWeightedAverage() (gas: 141765)
+ReservoirPriceOracleTest:testGetTimeWeightedAverage_Inverted() (gas: 120958)
 ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 10938)
-ReservoirPriceOracleTest:testSetRoute() (gas: 58954)
-ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 18066)
-ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 17695)
-ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 194508)
-ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 12113)
-ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 162430)
-ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 12088)
+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: 259, μ: 21307, ~: 21085)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold() (gas: 216683)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_InsufficientReward(uint256) (runs: 259, μ: 205898, ~: 205839)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_ZeroRecipient() (gas: 198506)
-ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 205783)
-ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15879018)
-ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5354517)
-ReservoirPriceOracleTest:testUpdatePrice_WithinThreshold() (gas: 207022)
+ReservoirPriceOracleTest:testUpdatePriceDeviationThreshold(uint256) (runs: 256, μ: 21328, ~: 21085)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold() (gas: 213770)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_InsufficientReward(uint256) (runs: 256, μ: 202989, ~: 203067)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondThreshold_ZeroRecipient() (gas: 195593)
+ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 203220)
+ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15867847)
+ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5350717)
+ReservoirPriceOracleTest:testUpdatePrice_WithinThreshold() (gas: 204109)
 ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19033)
 ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10984)
-ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 259, μ: 21733, ~: 21828)
-ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 259, μ: 17867, ~: 18164)
-ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 259, μ: 30289, ~: 30047)
-SamplesTest:testAccumulator() (gas: 4580)
-SamplesTest:testAccumulator_BadVariableRequest() (gas: 4045)
-SamplesTest:testInstant() (gas: 4536)
-SamplesTest:testInstant_BadVariableRequest() (gas: 4088)
\ No newline at end of file
+ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21745, ~: 21828)
+ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17861, ~: 18164)
+ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 29939, ~: 29697)
+RoutesLibTest:testGetDecimalDifference() (gas: 3974)
+RoutesLibTest:testIsCompositeRoute() (gas: 4341)
+RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 7786, ~: 7555)
+SamplesTest:testAccumulator() (gas: 3959)
+SamplesTest:testAccumulator_BadVariableRequest() (gas: 3523)
+SamplesTest:testInstant() (gas: 3909)
+SamplesTest:testInstant_BadVariableRequest() (gas: 3566)
\ No newline at end of file