diff --git a/MedusaPluginChargeMachine/Handlers/LA9/ChargeEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/ChargeEaChargeHandler.cs
index 2736e16..f376e84 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/ChargeEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/ChargeEaChargeHandler.cs
@@ -22,7 +22,7 @@ public class ChargeEaChargeHandler(
         Method("charge");
     }
 
-    public override async Task<ChargeResponse> HandleAsync(ChargeRequest req, string model)
+    public override async Task<ChargeResponse> HandleAsync(ChargeRequest req, GameModel model)
     {
         var amount = int.Parse(req.ChargeNumber) * 1000;
 
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/CheckinEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/CheckinEaChargeHandler.cs
index 153e915..a5bf8c7 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/CheckinEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/CheckinEaChargeHandler.cs
@@ -15,7 +15,7 @@ namespace MedusaPluginChargeMachine.Handlers.LA9
             Module("eacharge");
             Method("checkin");
         }
-        public override async Task<CheckinResponse> HandleAsync(CheckinRequest req, string model)
+        public override async Task<CheckinResponse> HandleAsync(CheckinRequest req, GameModel model)
         {
             var sessionId = sessionService.AddSession(req.CardId);
 
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/CheckoutEaCharge.cs b/MedusaPluginChargeMachine/Handlers/LA9/CheckoutEaChargeHandler.cs
similarity index 84%
rename from MedusaPluginChargeMachine/Handlers/LA9/CheckoutEaCharge.cs
rename to MedusaPluginChargeMachine/Handlers/LA9/CheckoutEaChargeHandler.cs
index a97cd84..515e61c 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/CheckoutEaCharge.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/CheckoutEaChargeHandler.cs
@@ -7,14 +7,14 @@ using ISessionService = MedusaPluginChargeMachine.Services.ISessionService;
 
 namespace MedusaPluginChargeMachine.Handlers.LA9
 {
-    public class CheckoutEaCharge(ISessionService sessionService): Handler<CheckoutRequest, CheckoutResponse>
+    public class CheckoutEaChargeHandler(ISessionService sessionService): Handler<CheckoutRequest, CheckoutResponse>
     {
         public override void Configure()
         {
             Module("eacharge");
             Method("checkout");
         }
-        public override CheckoutResponse Handle(CheckoutRequest req, string model)
+        public override CheckoutResponse Handle(CheckoutRequest req, GameModel model)
         {
             sessionService.RemoveSession(req.SessionId);
 
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/GetConfigEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/GetConfigEaChargeHandler.cs
index 212926f..424a57b 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/GetConfigEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/GetConfigEaChargeHandler.cs
@@ -14,7 +14,7 @@ public class GetConfigEaChargeHandler(ChargeMachineDbContext db) : Handler<Empty
         Method("getconf");
     }
 
-    public override async Task<EaChargeConfigResponse> HandleAsync(EmptyRequest _, string model)
+    public override async Task<EaChargeConfigResponse> HandleAsync(EmptyRequest _, GameModel model)
     {
         var articles = await db.ArticleContents.ToListAsync();
 
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/GetLastLogEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/GetLastLogEaChargeHandler.cs
index ab7e9fb..609f6e7 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/GetLastLogEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/GetLastLogEaChargeHandler.cs
@@ -16,7 +16,7 @@ public class GetLastLogEaChargeHandler(ISessionService sessionService, ChargeMac
         Method("getlastlog");
     }
 
-    public override async Task<GetLastLogEaChargeResponse> HandleAsync(GetLastLogRequest req, string model)
+    public override async Task<GetLastLogEaChargeResponse> HandleAsync(GetLastLogRequest req, GameModel model)
     {
         var today = DateTime.UtcNow.Date;
         var cardId = (string?)null;
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/GetRecentChargeEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/GetRecentChargeEaChargeHandler.cs
index 6375f2b..2952984 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/GetRecentChargeEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/GetRecentChargeEaChargeHandler.cs
@@ -16,7 +16,7 @@ public class GetRecentChargeEaChargeHandler(ISessionService sessionService, Char
         Method("getrecentcharge");
     }
 
-    public override async Task<GetRecentChargeResponse> HandleAsync(GetRecentChargeRequest req, string model)
+    public override async Task<GetRecentChargeResponse> HandleAsync(GetRecentChargeRequest req, GameModel model)
     {
         var cardId = ResolveCardId(req);
 
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/OpChPassEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/OpChPassEaChargeHandler.cs
index bb191d4..33b540b 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/OpChPassEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/OpChPassEaChargeHandler.cs
@@ -20,7 +20,7 @@ public class OpChPassEaChargeHandler(
         Method("opchpass");
     }
 
-    public override async Task<OpChPassResponse> HandleAsync(OpChPassRequest req, string model)
+    public override async Task<OpChPassResponse> HandleAsync(OpChPassRequest req, GameModel model)
     {
         var session = sessionService.GetSession(req.SessionId);
         var card = await cardService.FindByCardId(session.refId);
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/OpCheckinEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/OpCheckinEaChargeHandler.cs
index c3289e0..69eb4bb 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/OpCheckinEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/OpCheckinEaChargeHandler.cs
@@ -15,7 +15,7 @@ public class OpCheckinEaChargeHandler(ISessionService sessionService): Handler<O
         Method("opcheckin");
     }
 
-    public override OpCheckinResponse Handle(OpCheckinRequest req, string model)
+    public override OpCheckinResponse Handle(OpCheckinRequest req, GameModel model)
     {
         var sessionId = sessionService.AddSession(req.SourceId);
         
diff --git a/MedusaPluginChargeMachine/Handlers/LA9/OpCheckoutEaChargeHandler.cs b/MedusaPluginChargeMachine/Handlers/LA9/OpCheckoutEaChargeHandler.cs
index 3fe244b..67c8de5 100644
--- a/MedusaPluginChargeMachine/Handlers/LA9/OpCheckoutEaChargeHandler.cs
+++ b/MedusaPluginChargeMachine/Handlers/LA9/OpCheckoutEaChargeHandler.cs
@@ -14,7 +14,7 @@ public class OpCheckoutEaChargeHandler(ISessionService sessionService): Handler<
         Method("opcheckout");
     }
     
-    public override OpCheckoutResponse Handle(OpCheckoutRequest req, string model)
+    public override OpCheckoutResponse Handle(OpCheckoutRequest req, GameModel model)
     {
         sessionService.RemoveSession(req.SessionId);