diff --git a/Class_Diagram.md b/Class_Diagram.md
index 861fd1e..cb5076c 100644
--- a/Class_Diagram.md
+++ b/Class_Diagram.md
@@ -243,7 +243,7 @@ Turn .left. (Die, Face) : [*] /+DiceNFaces
   Face "[1]" -up- "[1]" Die
 Turn -down-> "/+Player" Player
 
-MasterOfCeremonies --> IManager : "T <-- <KeyValuePair<string, [*] Die>>"
+MasterOfCeremonies --> IManager : "T <-- <DiceGroup>"
 MasterOfCeremonies --> IManager : "T <-- <Player>"
 MasterOfCeremonies --> IManager : "T <-- <Game>"
 
@@ -283,7 +283,7 @@ package Model <<Frame>> #bada55 {
     class PlayerManager $done
     
     class Player $done {
-      -name: string
+      /+Name: string
     }
   
   }
@@ -322,6 +322,10 @@ package Model <<Frame>> #bada55 {
   package Dice #fdb {
   
     class DiceGroupManager $inprogress
+    
+    class DiceGroup $done {
+      /+Name: string
+    }
   
     abstract class Die $done {
       {static} ~rdm: Random
@@ -352,8 +356,9 @@ ImageDie --|> HomogeneousDie : "T <-- <Uri>"
 ColorDie --|> HomogeneousDie : "T <-- <Color>"
 NumberDie --|> HomogeneousDie : "T <-- <int>"
 
-DiceGroupManager ..|> IManager : "T <-- <KeyValuePair<string, [*] Die>>"
-DiceGroupManager -up-> "[*[*]] -diceGroups" Die
+DiceGroupManager ..|> IManager : "T <-- <DiceGroup>"
+DiceGroupManager -up-> "[*] -diceGroups" DiceGroup
+DiceGroup -up-> "[*] -dice" Die
 
 HomogeneousDie --|> Die