diff --git a/.gas-snapshot b/.gas-snapshot
index 9615800..e4f9362 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,42 +1,42 @@
-QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 66580346, ~: 74677417)
-QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 65654168, ~: 74637564)
-QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056944892)
-QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80139, ~: 80169)
-QueryProcessorTest:testGetInstantValue() (gas: 123891)
-QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19378, ~: 19378)
-QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 68260435, ~: 68260368)
-QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26888, ~: 26962)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 73163775, ~: 80971220)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69034009, ~: 77518108)
-QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 69063807, ~: 77549589)
-QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 65628240, ~: 74609149)
-QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 65662034, ~: 74643790)
-QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 65619855, ~: 74600885)
-QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 65631299, ~: 74610735)
-QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 105247875, ~: 113034890)
+QueryProcessorTest:testFindNearestSample_CanFindExactValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 69038209, ~: 78939846)
+QueryProcessorTest:testFindNearestSample_CanFindIntermediateValue(uint32,uint256,uint256,uint256) (runs: 256, μ: 68311518, ~: 79140121)
+QueryProcessorTest:testFindNearestSample_NotInitialized() (gas: 1056944146)
+QueryProcessorTest:testFindNearestSample_OneSample(uint256) (runs: 256, μ: 80622, ~: 80652)
+QueryProcessorTest:testGetInstantValue() (gas: 124418)
+QueryProcessorTest:testGetInstantValue_NotInitialized(uint256) (runs: 256, μ: 19400, ~: 19400)
+QueryProcessorTest:testGetInstantValue_NotInitialized_BeyondBufferSize(uint8,uint16) (runs: 256, μ: 69204608, ~: 69204518)
+QueryProcessorTest:testGetPastAccumulator_BufferEmpty(uint8) (runs: 256, μ: 26930, ~: 26984)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch(uint32,uint256,uint256,uint16) (runs: 256, μ: 73842560, ~: 83474413)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_LatestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68671249, ~: 78734958)
+QueryProcessorTest:testGetPastAccumulator_ExactMatch_OldestAccumulator(uint32,uint256,uint256) (runs: 256, μ: 68701118, ~: 78766725)
+QueryProcessorTest:testGetPastAccumulator_ExtrapolatesBeyondLatest(uint32,uint256,uint256,uint256) (runs: 256, μ: 68285121, ~: 79111756)
+QueryProcessorTest:testGetPastAccumulator_InterpolatesBetweenPastAccumulators(uint32,uint256,uint256,uint256) (runs: 256, μ: 68319459, ~: 79146413)
+QueryProcessorTest:testGetPastAccumulator_InvalidAgo(uint32,uint256,uint256,uint256) (runs: 256, μ: 68276708, ~: 79102843)
+QueryProcessorTest:testGetPastAccumulator_QueryTooOld(uint32,uint256,uint256,uint256) (runs: 256, μ: 68288213, ~: 79113100)
+QueryProcessorTest:testGetTimeWeightedAverage(uint32,uint256,uint256,uint256,uint256) (runs: 256, μ: 103845966, ~: 112262763)
 QueryProcessorTest:testGetTimeWeightedAverage_BadSecs() (gas: 10981)
-ReservoirPriceOracleTest:testClearRoute() (gas: 52216)
-ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 159654)
-ReservoirPriceOracleTest:testDesignatePair() (gas: 29038)
-ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21133)
+ReservoirPriceOracleTest:testClearRoute() (gas: 52209)
+ReservoirPriceOracleTest:testClearRoute_AllWordsCleared() (gas: 159631)
+ReservoirPriceOracleTest:testDesignatePair() (gas: 29056)
+ReservoirPriceOracleTest:testDesignatePair_IncorrectPair() (gas: 21148)
 ReservoirPriceOracleTest:testDesignatePair_NotOwner() (gas: 17541)
 ReservoirPriceOracleTest:testDesignatePair_TokenOrderReversed() (gas: 30605)
-ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33689, ~: 33805)
+ReservoirPriceOracleTest:testGetQuote(uint256,uint256) (runs: 256, μ: 33696, ~: 33805)
 ReservoirPriceOracleTest:testGetQuote_AmountInTooLarge() (gas: 12950)
-ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401380, ~: 401124)
-ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10127860)
-ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35812, ~: 35985)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 111603)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 111924)
-ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 122238)
-ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20788)
+ReservoirPriceOracleTest:testGetQuote_BaseIsVault(uint256) (runs: 256, μ: 401362, ~: 401124)
+ReservoirPriceOracleTest:testGetQuote_ComplicatedDecimals() (gas: 10361834)
+ReservoirPriceOracleTest:testGetQuote_Inverse(uint256,uint256) (runs: 256, μ: 35820, ~: 35987)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops() (gas: 111582)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops_Inverse() (gas: 111900)
+ReservoirPriceOracleTest:testGetQuote_MultipleHops_PriceZero() (gas: 122208)
+ReservoirPriceOracleTest:testGetQuote_NoFallbackOracle() (gas: 20776)
 ReservoirPriceOracleTest:testGetQuote_PriceZero() (gas: 15930)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5198028, ~: 5198035)
-ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10269544, ~: 10269654)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_1HopRoute(uint256,uint256,address,address,uint8,uint8) (runs: 256, μ: 5316035, ~: 5316010)
+ReservoirPriceOracleTest:testGetQuote_RandomizeAllParam_2HopRoute(uint256,uint256,uint256,address,address,address,uint8,uint8,uint8) (runs: 256, μ: 10503497, ~: 10503613)
 ReservoirPriceOracleTest:testGetQuote_SameBaseQuote(uint256,address) (runs: 256, μ: 8927, ~: 8927)
-ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38250)
+ReservoirPriceOracleTest:testGetQuote_UseFallback() (gas: 38244)
 ReservoirPriceOracleTest:testGetQuote_ZeroIn() (gas: 36635)
-ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26211, ~: 26327)
+ReservoirPriceOracleTest:testGetQuotes(uint256,uint256) (runs: 256, μ: 26240, ~: 26349)
 ReservoirPriceOracleTest:testPriceCache_Inverted() (gas: 21949)
 ReservoirPriceOracleTest:testSetFallbackOracle_NotOwner() (gas: 10928)
 ReservoirPriceOracleTest:testSetRoute() (gas: 61014)
@@ -45,28 +45,28 @@ ReservoirPriceOracleTest:testSetRoute_InvalidRoute() (gas: 20106)
 ReservoirPriceOracleTest:testSetRoute_InvalidRouteLength() (gas: 19253)
 ReservoirPriceOracleTest:testSetRoute_MultipleHops() (gas: 201105)
 ReservoirPriceOracleTest:testSetRoute_NotSorted() (gas: 13006)
-ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 169491)
+ReservoirPriceOracleTest:testSetRoute_OverwriteExisting() (gas: 169482)
 ReservoirPriceOracleTest:testSetRoute_SameToken() (gas: 13019)
-ReservoirPriceOracleTest:testUndesignatePair() (gas: 30215)
+ReservoirPriceOracleTest:testUndesignatePair() (gas: 30237)
 ReservoirPriceOracleTest:testUndesignatePair_NotOwner() (gas: 15344)
-ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 163637, ~: 163657)
-ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 148532, ~: 148476)
-ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 161152, ~: 161177)
-ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 152255)
-ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 15927172)
-ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5288225)
-ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 151436)
-ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 209567, ~: 209771)
-ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 145106)
-ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19027)
-ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10930)
-ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21569, ~: 21656)
-ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17709, ~: 17994)
-ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30063, ~: 29807)
+ReservoirPriceOracleTest:testUpdatePrice_AboveThresholdBelowMaxReward(uint256) (runs: 256, μ: 164717, ~: 164737)
+ReservoirPriceOracleTest:testUpdatePrice_BelowThreshold(uint256) (runs: 256, μ: 149562, ~: 149238)
+ReservoirPriceOracleTest:testUpdatePrice_BeyondMaxReward(uint256) (runs: 256, μ: 162212, ~: 162240)
+ReservoirPriceOracleTest:testUpdatePrice_FirstUpdate() (gas: 153342)
+ReservoirPriceOracleTest:testUpdatePrice_IntermediateRoutes() (gas: 16283142)
+ReservoirPriceOracleTest:testUpdatePrice_PriceOutOfRange() (gas: 5408263)
+ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ContractNoReceive() (gas: 152501)
+ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_InsufficientReward(uint256) (runs: 256, μ: 210795, ~: 211013)
+ReservoirPriceOracleTest:testUpdatePrice_RewardEligible_ZeroRecipient() (gas: 146149)
+ReservoirPriceOracleTest:testUpdateRewardGasAmount() (gas: 19038)
+ReservoirPriceOracleTest:testUpdateRewardGasAmount_NotOwner() (gas: 10952)
+ReservoirPriceOracleTest:testUpdateTwapPeriod(uint256) (runs: 256, μ: 21576, ~: 21667)
+ReservoirPriceOracleTest:testUpdateTwapPeriod_InvalidTwapPeriod(uint256) (runs: 256, μ: 17701, ~: 17994)
+ReservoirPriceOracleTest:testWritePriceCache(uint256) (runs: 256, μ: 30057, ~: 29819)
 RoutesLibTest:testGetDecimalDifference() (gas: 3966)
 RoutesLibTest:testIsCompositeRoute() (gas: 4332)
-RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 8097, ~: 7862)
-SamplesTest:testAccumulator() (gas: 3952)
+RoutesLibTest:testPackSimplePrice(int8,uint256) (runs: 256, μ: 8083, ~: 7862)
+SamplesTest:testAccumulator() (gas: 3930)
 SamplesTest:testAccumulator_BadVariableRequest() (gas: 3355)
-SamplesTest:testInstant() (gas: 3902)
-SamplesTest:testInstant_BadVariableRequest() (gas: 3398)
\ No newline at end of file
+SamplesTest:testInstant() (gas: 3880)
+SamplesTest:testInstant_BadVariableRequest() (gas: 3376)
\ No newline at end of file