diff --git a/simnet/client/genshin.py b/simnet/client/genshin.py
index 813ae87..a644e92 100644
--- a/simnet/client/genshin.py
+++ b/simnet/client/genshin.py
@@ -1,6 +1,7 @@
 from typing import Optional
 
 from simnet.client.components.auth import AuthClient
+from simnet.client.components.calculator.genshin import CalculatorClient
 from simnet.client.components.chronicle.genshin import GenshinBattleChronicleClient
 from simnet.client.components.daily import DailyRewardClient
 from simnet.client.components.diary.genshin import GenshinDiaryClient
@@ -13,6 +14,7 @@ __all__ = ("GenshinClient",)
 
 
 class GenshinClient(
+    CalculatorClient,
     GenshinBattleChronicleClient,
     GenshinWishClient,
     GenshinDiaryClient,
diff --git a/simnet/client/genshin.pyi b/simnet/client/genshin.pyi
index 22580ef..e56a47e 100644
--- a/simnet/client/genshin.pyi
+++ b/simnet/client/genshin.pyi
@@ -1,6 +1,7 @@
 from typing import Optional
 
 from simnet.client.components.auth import AuthClient
+from simnet.client.components.calculator.genshin import CalculatorClient
 from simnet.client.components.chronicle.genshin import GenshinBattleChronicleClient
 from simnet.client.components.daily import DailyRewardClient
 from simnet.client.components.diary.genshin import GenshinDiaryClient
@@ -12,6 +13,7 @@ from simnet.utils.types import CookieTypes, HeaderTypes, TimeoutTypes
 
 
 class GenshinClient(
+    CalculatorClient,
     GenshinBattleChronicleClient,
     GenshinWishClient,
     GenshinDiaryClient,