diff --git a/src/game/GameCrashManager.ts b/src/game/GameCrashManager.ts
index c513228..45d8f19 100644
--- a/src/game/GameCrashManager.ts
+++ b/src/game/GameCrashManager.ts
@@ -1,5 +1,5 @@
-import { MancalaGame } from "mancala.js";
 import fs from "fs";
+import { Game } from "../models/Game";
 const crashFolder = "./crashes";
 export class GameCrashManager {
   constructor() {}
@@ -22,7 +22,7 @@ export class GameCrashManager {
     return `${year}-${month}-${date}-${hours}:${minutes}:${seconds}:${miliSeconds}`;
   }
 
-  public static logGameCrash(error: Error, game: MancalaGame): string {
+  public static logGameCrash(error: Error, game: Game): string {
     this.createCrashFolderIfNotExist();
     const crash = {
       message: error.message,
diff --git a/src/game/gamestore/GameStore.ts b/src/game/gamestore/GameStore.ts
index 882ab36..8813b29 100644
--- a/src/game/gamestore/GameStore.ts
+++ b/src/game/gamestore/GameStore.ts
@@ -1,15 +1,15 @@
-import { MancalaGame } from "mancala.js";
+import { Game } from "../../models/Game";
 
 export interface GameStore {
-    get(id: string): MancalaGame | undefined;
-    set(id: string, game: MancalaGame): void;
+    get(id: string): Game | undefined;
+    set(id: string, game: Game): void;
     remove(id: string): void;
 
     setGameIdByUser(userId: string, gameId: string): void;
     getGameIdByUser(userId: string): string | undefined;
     removeGameIdByPlayer(userId: string): void;
 
-    setGameByUser(userId: string, game: MancalaGame): void;
-    getGameByUser(userId: string): MancalaGame | undefined;
+    setGameByUser(userId: string, game: Game): void;
+    getGameByUser(userId: string): Game | undefined;
     removeGameByPlayer(userId: string): void;
 }
\ No newline at end of file
diff --git a/src/game/gamestore/GameStoreImpl.ts b/src/game/gamestore/GameStoreImpl.ts
index a5cde9f..e720cb4 100644
--- a/src/game/gamestore/GameStoreImpl.ts
+++ b/src/game/gamestore/GameStoreImpl.ts
@@ -1,14 +1,14 @@
-import { MancalaGame } from "mancala.js";
+import { Game } from "../../models/Game";
 import { GameStore } from "./GameStore";
 
 export class GameStoreImpl implements GameStore {
-    gameStore: Map<string, MancalaGame> = new Map<string, MancalaGame>()
+    gameStore: Map<string, Game> = new Map<string, Game>()
     userGameMap: Map<string, string> = new Map<string, string>()
 
-    get(id: string): MancalaGame | undefined {
+    get(id: string): Game | undefined {
         return this.gameStore.get(id);
     }
-    set(id: string, game: MancalaGame): void {
+    set(id: string, game: Game): void {
         this.gameStore.set(id, game);
     }
     remove(id: string): void {
@@ -25,10 +25,10 @@ export class GameStoreImpl implements GameStore {
         this.userGameMap.delete(userId);
     }
 
-    setGameByUser(userId: string, game: MancalaGame): void {
+    setGameByUser(userId: string, game: Game): void {
         this.setGameIdByUser(userId, game.id);
     }
-    getGameByUser(userId: string): MancalaGame | undefined {
+    getGameByUser(userId: string): Game | undefined {
         const gameId = this.getGameIdByUser(userId);
         return gameId && this.gameStore.get(gameId) || undefined;
     }