diff --git a/.gas-snapshot b/.gas-snapshot
index 535cbce..4f68341 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,63 +1,85 @@
-AddToAllowlist_Unit_Concrete_Test:test_AddToAllowlist() (gas: 178178)
-AddToAllowlist_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 12955)
-AddToAllowlist_Unit_Concrete_Test:test_RevertWhen_InvalidZeroCodeModule() (gas: 13123)
-CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodLinearStream_StatusOngoing() (gas: 326597)
-CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodLinearStream_StatusPending() (gas: 30566)
-CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodTranchedStream_StatusOngoing() (gas: 445110)
-CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodTranchedStream_StatusPending() (gas: 30566)
-CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodTransfer() (gas: 30497)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceIsCanceled() (gas: 27177)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceIsPaid() (gas: 49663)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodLinearStream_StatusOngoing_SenderNoInitialtStreamSender() (gas: 285668)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodLinearStream_StatusPending_SenderNotInvoiceRecipient() (gas: 20666)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_StatusOngoing_SenderNoInitialtStreamSender() (gas: 402986)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_StatusPending_SenderNotInvoiceRecipient() (gas: 20642)
-CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTransfer_SenderNotInvoiceRecipient() (gas: 20575)
-CreateContainer_Unit_Concrete_Test:test_CreateContainer_DockIdNonZero() (gas: 2079188)
-CreateContainer_Unit_Concrete_Test:test_CreateContainer_DockIdZero() (gas: 1066370)
-CreateContainer_Unit_Concrete_Test:test_RevertWhen_CallerNotDockOwner() (gas: 1084452)
-CreateInvoice_Integration_Concret_Test:test_CreateInvoice_LinearStream() (gas: 251262)
-CreateInvoice_Integration_Concret_Test:test_CreateInvoice_PaymentMethodOneOffTransfer() (gas: 251466)
-CreateInvoice_Integration_Concret_Test:test_CreateInvoice_RecurringTransfer() (gas: 252617)
-CreateInvoice_Integration_Concret_Test:test_CreateInvoice_Tranched() (gas: 252890)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_CallerNotContract() (gas: 89343)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_EndTimeInThePast() (gas: 102376)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_NonCompliantContainer() (gas: 92598)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodLinearStream_PaymentAssetNativeToken() (gas: 102494)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodRecurringTransfer_PaymentIntervalTooShortForSelectedRecurrence() (gas: 103184)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_PaymentAssetNativeToken() (gas: 103664)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_PaymentIntervalTooShortForSelectedRecurrence() (gas: 103228)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_RecurrenceSetToOneOff() (gas: 101872)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_StartTimeGreaterThanEndTime() (gas: 101700)
-CreateInvoice_Integration_Concret_Test:test_RevertWhen_ZeroPaymentAmount() (gas: 81059)
-DisableModule_Unit_Concrete_Test:test_DisableModule() (gas: 177591)
-DisableModule_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 16425)
-EnableModule_Unit_Concrete_Test:test_EnableModule() (gas: 33937)
-EnableModule_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 16422)
-EnableModule_Unit_Concrete_Test:test_RevertWhen_ModuleNotAllowlisted() (gas: 24667)
-Execute_Unit_Concrete_Test:test_Execute() (gas: 84136)
-Execute_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 18992)
-Execute_Unit_Concrete_Test:test_RevertWhen_ModuleNotEnabled() (gas: 19065)
-PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodLinearStream() (gas: 309543)
-PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodTranchedStream() (gas: 434948)
-PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodTransfer_ERC20Token_Recurring() (gas: 87177)
-PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodTransfer_NativeToken_OneOff() (gas: 63518)
-PayInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceAlreadyPaid() (gas: 62518)
-PayInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceCanceled() (gas: 29675)
-PayInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceNull() (gas: 17874)
-PayInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTransfer_NativeTokenTransferFails() (gas: 166006)
-PayInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTransfer_PaymentAmountLessThanInvoiceValue() (gas: 31961)
-Receive_Unit_Concrete_Test:test_Receive() (gas: 20732)
-RemoveFromAllowlist_Unit_Concrete_Test:test_AddToAllowlist() (gas: 22211)
-RemoveFromAllowlist_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 12982)
-TransferContainerOwnership_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 1083749)
-TransferContainerOwnership_Unit_Concrete_Test:test_RevertWhen_InvalidOwnerZeroAddress() (gas: 1081714)
-TransferContainerOwnership_Unit_Concrete_Test:test_transferContainerOwnership() (gas: 1089571)
-WithdrawERC20_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 16382)
-WithdrawERC20_Unit_Concrete_Test:test_RevertWhen_InsufficientERC20ToWithdraw() (gas: 24022)
-WithdrawERC20_Unit_Concrete_Test:test_WithdrawERC20() (gas: 90472)
-WithdrawLinearStream_Integration_Concret_Test:test_WithdrawLinearStream() (gas: 317093)
-WithdrawNative_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 16402)
-WithdrawNative_Unit_Concrete_Test:test_RevertWhen_InsufficientNativeToWithdraw() (gas: 16391)
-WithdrawNative_Unit_Concrete_Test:test_WithdrawNative() (gas: 37436)
-WithdrawTranchedStream_Integration_Concret_Test:test_WithdrawTranchedStream() (gas: 437924)
\ No newline at end of file
+AddToAllowlist_Unit_Concrete_Test:test_AddToAllowlist() (gas: 241256)
+AddToAllowlist_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 13752)
+AddToAllowlist_Unit_Concrete_Test:test_RevertWhen_InvalidZeroCodeModule() (gas: 13925)
+CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodLinearStream_StatusOngoing() (gas: 446811)
+CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodLinearStream_StatusPending() (gas: 30578)
+CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodTranchedStream_StatusOngoing() (gas: 446790)
+CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodTranchedStream_StatusPending() (gas: 30580)
+CancelInvoice_Integration_Concret_Test:test_CancelInvoice_PaymentMethodTransfer() (gas: 30520)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceIsCanceled() (gas: 27133)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceIsPaid() (gas: 49603)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodLinearStream_StatusOngoing_SenderNoInitialtStreamSender() (gas: 404607)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodLinearStream_StatusPending_SenderNotInvoiceRecipient() (gas: 20633)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_StatusOngoing_SenderNoInitialtStreamSender() (gas: 404628)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_StatusPending_SenderNotInvoiceRecipient() (gas: 20611)
+CancelInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTransfer_SenderNotInvoiceRecipient() (gas: 20553)
+ComputeNumberOfPayments_Helpers_Test:test_ComputeNumberOfPayments_Monthly() (gas: 4156)
+ComputeNumberOfPayments_Helpers_Test:test_ComputeNumberOfPayments_Weekly() (gas: 4082)
+ComputeNumberOfPayments_Helpers_Test:test_ComputeNumberOfPayments_Yearly() (gas: 4266)
+Constructor_DockRegistry_Test:test_Constructor() (gas: 3353665)
+Constructor_ModuleKeeper_Test:test_Constructor() (gas: 416041)
+Constructor_StreamManager_Integration_Concret_Test:test_Constructor() (gas: 1615852)
+CreateContainer_Unit_Concrete_Test:test_CreateContainer_DockIdNonZero() (gas: 3030474)
+CreateContainer_Unit_Concrete_Test:test_CreateContainer_DockIdZero() (gas: 1548403)
+CreateContainer_Unit_Concrete_Test:test_RevertWhen_CallerNotDockOwner() (gas: 1561938)
+CreateInvoice_Integration_Concret_Test:test_CreateInvoice_LinearStream() (gas: 258963)
+CreateInvoice_Integration_Concret_Test:test_CreateInvoice_PaymentMethodOneOffTransfer() (gas: 259167)
+CreateInvoice_Integration_Concret_Test:test_CreateInvoice_RecurringTransfer() (gas: 260318)
+CreateInvoice_Integration_Concret_Test:test_CreateInvoice_Tranched() (gas: 260591)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_CallerNotContract() (gas: 89299)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_EndTimeInThePast() (gas: 107235)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_NonCompliantContainer() (gas: 92554)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodLinearStream_PaymentAssetNativeToken() (gas: 107353)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodRecurringTransfer_PaymentIntervalTooShortForSelectedRecurrence() (gas: 108043)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_PaymentAssetNativeToken() (gas: 108523)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_PaymentIntervalTooShortForSelectedRecurrence() (gas: 108087)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTranchedStream_RecurrenceSetToOneOff() (gas: 106731)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_StartTimeGreaterThanEndTime() (gas: 106559)
+CreateInvoice_Integration_Concret_Test:test_RevertWhen_ZeroPaymentAmount() (gas: 85918)
+CreateInvoice_Integration_Fuzz_Test:testFuzz_CreateInvoice(uint8,uint8,address,uint40,uint40,uint128) (runs: 10001, μ: 202392, ~: 259073)
+DisableModule_Unit_Concrete_Test:test_DisableModule() (gas: 249454)
+DisableModule_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 22806)
+EnableModule_Unit_Concrete_Test:test_EnableModule() (gas: 42771)
+EnableModule_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 22785)
+EnableModule_Unit_Concrete_Test:test_RevertWhen_ModuleNotAllowlisted() (gas: 32658)
+Execute_Unit_Concrete_Test:test_Execute() (gas: 96131)
+Execute_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 26420)
+Execute_Unit_Concrete_Test:test_RevertWhen_ModuleNotEnabled() (gas: 26485)
+PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodLinearStream() (gas: 309509)
+PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodTranchedStream() (gas: 436650)
+PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodTransfer_ERC20Token_Recurring() (gas: 87178)
+PayInvoice_Integration_Concret_Test:test_PayInvoice_PaymentMethodTransfer_NativeToken_OneOff() (gas: 63525)
+PayInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceAlreadyPaid() (gas: 62436)
+PayInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceCanceled() (gas: 29609)
+PayInvoice_Integration_Concret_Test:test_RevertWhen_InvoiceNull() (gas: 17829)
+PayInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTransfer_NativeTokenTransferFails() (gas: 170827)
+PayInvoice_Integration_Concret_Test:test_RevertWhen_PaymentMethodTransfer_PaymentAmountLessThanInvoiceValue() (gas: 31912)
+PayInvoice_Integration_Fuzz_Test:testFuzz_PayInvoice(uint8,uint8,uint40,uint40,uint128) (runs: 10002, μ: 369458, ~: 342362)
+Receive_Unit_Concrete_Test:test_Receive() (gas: 21868)
+RemoveFromAllowlist_Unit_Concrete_Test:test_AddToAllowlist() (gas: 23859)
+RemoveFromAllowlist_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 13752)
+TransferContainerOwnership_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 1561103)
+TransferContainerOwnership_Unit_Concrete_Test:test_RevertWhen_InvalidOwnerZeroAddress() (gas: 1559040)
+TransferContainerOwnership_Unit_Concrete_Test:test_TransferContainerOwnership() (gas: 1569104)
+TransferDockOwnership_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 1560963)
+TransferDockOwnership_Unit_Concrete_Test:test_TransferDockOwnership() (gas: 1568645)
+TransferOwnership_Unit_Concrete_Test:test_RevertWhen_CallerNotCurrentOwner() (gas: 15849)
+TransferOwnership_Unit_Concrete_Test:test_RevertWhen_NewOwnerZeroAddress() (gas: 13765)
+TransferOwnership_Unit_Concrete_Test:test_TransferOwnership() (gas: 24347)
+TransferOwnership_Unit_Fuzz_Test:testFuzz_RevertWhen_CallerNotCurrentOwner(address) (runs: 10002, μ: 14624, ~: 14624)
+TransferOwnership_Unit_Fuzz_Test:testFuzz_TransferOwnership(address) (runs: 10002, μ: 22748, ~: 22748)
+UpdateModuleKeeper_Unit_Concrete_Test:test_RevertWhen_CallerNotRegistryOwner() (gas: 20219)
+UpdateModuleKeeper_Unit_Concrete_Test:test_UpdateModuleKeeper() (gas: 29457)
+UpdateStreamBrokerFee_Integration_Concret_Test:test_RevertWhen_CallerNotOwner() (gas: 12864)
+UpdateStreamBrokerFee_Integration_Concret_Test:test_UpdateStreamBrokerFee() (gas: 38936)
+UpgradeToAndCall_DockRegistry_Test:test_RevertWhen_CallerNotRegistryOwner() (gas: 23388)
+UpgradeToAndCall_DockRegistry_Test:test_UpgradeToAndCall() (gas: 35430)
+WithdrawERC20_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 23342)
+WithdrawERC20_Unit_Concrete_Test:test_RevertWhen_InsufficientERC20ToWithdraw() (gas: 31627)
+WithdrawERC20_Unit_Concrete_Test:test_WithdrawERC20() (gas: 104376)
+WithdrawLinearStream_Integration_Concret_Test:test_WithdrawStream_LinearStream() (gas: 295994)
+WithdrawLinearStream_Integration_Concret_Test:test_WithdrawStream_TranchedStream() (gas: 424090)
+WithdrawNative_Unit_Concrete_Test:test_RevertWhen_CallerNotOwner() (gas: 22882)
+WithdrawNative_Unit_Concrete_Test:test_RevertWhen_InsufficientNativeToWithdraw() (gas: 22871)
+WithdrawNative_Unit_Concrete_Test:test_RevertWhen_NativeWithdrawFailed() (gas: 38894)
+WithdrawNative_Unit_Concrete_Test:test_WithdrawNative() (gas: 45302)
\ No newline at end of file