diff --git a/contracts/saddle/interfaces/ISwap.sol b/contracts/saddle/interfaces/ISwap.sol
index accc302c..4a821d61 100644
--- a/contracts/saddle/interfaces/ISwap.sol
+++ b/contracts/saddle/interfaces/ISwap.sol
@@ -17,6 +17,8 @@ interface ISwap {
 
     function getTokenBalance(uint8 index) external view returns (uint256);
 
+    function getDepositTimestamp(address user) external view returns (uint256);
+
     function getVirtualPrice() external view returns (uint256);
 
     function isGuarded() external view returns (bool);
@@ -28,21 +30,28 @@ interface ISwap {
         uint256 dx
     ) external view returns (uint256);
 
-    function calculateTokenAmount(uint256[] calldata amounts, bool deposit)
-        external
-        view
-        returns (uint256);
+    function calculateTokenAmount(
+        address account,
+        uint256[] calldata amounts,
+        bool deposit
+    ) external view returns (uint256);
 
-    function calculateRemoveLiquidity(uint256 amount)
+    function calculateRemoveLiquidity(address account, uint256 amount)
         external
         view
         returns (uint256[] memory);
 
     function calculateRemoveLiquidityOneToken(
+        address account,
         uint256 tokenAmount,
         uint8 tokenIndex
     ) external view returns (uint256 availableTokenAmount);
 
+    function calculateCurrentWithdrawFee(address user)
+        external
+        view
+        returns (uint256);
+
     // state modifying functions
     function initialize(
         IERC20[] memory pooledTokens,