diff --git a/src/main/tjava/com/fanitas/evelyn/core/DesiredPositionCalculator.tjava b/src/main/tjava/com/fanitas/evelyn/core/DesiredPositionCalculator.tjava
index a586ec8..cde6e37 100644
--- a/src/main/tjava/com/fanitas/evelyn/core/DesiredPositionCalculator.tjava
+++ b/src/main/tjava/com/fanitas/evelyn/core/DesiredPositionCalculator.tjava
@@ -1,8 +1,8 @@
 package com.fanitas.evelyn.core;
 
+import com.r35157.libs.basic.Pair;
 import com.r35157.libs.valuetypes.basic.MoneyAmount;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 
 public interface DesiredPositionCalculator {
@@ -13,11 +13,11 @@ public interface DesiredPositionCalculator {
             MoneyAmount totalReadyAmountMintB
     );
 
-    Pair calculateTotalDistributedSums();
+    Pair<MoneyAmount, MoneyAmount> calculateTotalDistributedSums();
 
-    Pair calculateLockedSums(ΩPriceΩ currentPrice);
+    Pair<MoneyAmount, MoneyAmount> calculateLockedSums(ΩPriceΩ currentPrice);
 
-    Pair calculateRedistributableSums(
+    Pair<MoneyAmount, MoneyAmount> calculateRedistributableSums(
             ΩPriceΩ currentPrice,
             MoneyAmount inactiveInAccountMintA,
             MoneyAmount inactiveInAccountMintB,