diff --git a/Class_Diagram.md b/Class_Diagram.md
index ecbb0a6..61e614d 100644
--- a/Class_Diagram.md
+++ b/Class_Diagram.md
@@ -134,8 +134,8 @@ package Model <<Frame>> #bada55 {
   package Games #daf {
   
     class GameRunner $done {
-      /+GlobalPlayerManager: IManager
-      /+GlobalDieManager: IManager
+      /+GlobalPlayerManager: IManager<Player>
+      /+GlobalDieManager: IManager<KeyValuePair<string, [*] AbstractDie>>
       {static} +PlayGame(game: Game)
       +StartNewGame(name: string, players: IManager<Player>, dice: [*] AbstractDie): Game
     }
@@ -189,17 +189,17 @@ package Model <<Frame>> #bada55 {
   package Games #daf {
   
     class GameRunner $done {
-      /+GlobalPlayerManager: IManager
-      /+GlobalDieManager: IManager
+      /+GlobalPlayerManager: IManager<Player>
+      /+GlobalDieManager: IManager<KeyValuePair<string, [*] AbstractDie>>
       {static} +PlayGame(game: Game)
-      +StartNewGame(name: string, pm: PlayerManager, dice: [*] AbstractDie): Game
+      +StartNewGame(name: string, players: IManager<Player>, dice: [*] AbstractDie): Game
     }
     
     class Game $done {
       /+PlayerManager: IManager
       /+Name: string
       /+Dice: [*] AbstractDie
-      +PerformTurn()
+      +PerformTurn(player: Player)
       +GetHistory(): [*] Turn
       +GetWhoPlaysNow(): Player
       +PrepareNextPlayer(current: Player)