diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java
index dfe36188..a01c1247 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java
@@ -12,17 +12,17 @@ public class Piece {
     /**
      * The shield state of the piece.
      */
-    private int shield;
+    private ShieldState shield;
 
     /**
      * The current state of the piece.
      */
-    private int state;
+    private PieceState state;
 
     /**
      * The color of the piece.
      */
-    private final int color;
+    private final Color color;
 
     /**
      * The unique identifier of the piece.
@@ -36,15 +36,15 @@ public class Piece {
      * @param state the state of the piece
      */
     public Piece(Color color, PieceState state, int id) {
-        this.color = color.ordinal();
-        this.state = state.ordinal();
-        shield = ShieldState.NONE.ordinal();
+        this.color = color;
+        this.state = state;
+        shield = ShieldState.NONE;
     }
 
     private Piece() {
-        color = Color.NONE.ordinal();
-        state = PieceState.WAITING.ordinal();
-        shield = ShieldState.NONE.ordinal();
+        color = Color.NONE;
+        state = PieceState.WAITING;
+        shield = ShieldState.NONE;
     }
 
     /**
@@ -53,7 +53,7 @@ private Piece() {
      * @return the color of the piece
      */
     public void setShield(ShieldState shield) {
-        this.shield = shield.ordinal();
+        this.shield = shield;
     }
 
     /**
@@ -62,7 +62,7 @@ public void setShield(ShieldState shield) {
      * @return the color of the piece
      */
     public ShieldState getShield() {
-        return ShieldState.values()[shield];
+        return shield;
     }
 
     /**
@@ -71,7 +71,7 @@ public ShieldState getShield() {
      * @param state the state of the piece
      */
     public void setState(PieceState state) {
-        this.state = state.ordinal();
+        this.state = state;
     }
 
     /**
@@ -80,7 +80,7 @@ public void setState(PieceState state) {
      * @return the color of the piece
      */
     public PieceState getState() {
-        return PieceState.values()[state];
+        return state;
     }
 
     /**
@@ -89,7 +89,7 @@ public PieceState getState() {
      * @return the color of the piece
      */
     public boolean isShielded() {
-        return shield == ShieldState.ACTIVE.ordinal();
+        return shield == ShieldState.ACTIVE;
     }
 
     /**
@@ -98,7 +98,7 @@ public boolean isShielded() {
      * @return the color of the piece
      */
     public boolean isSuppressed() {
-        return shield == ShieldState.SUPPRESSED.ordinal();
+        return shield == ShieldState.SUPPRESSED;
     }
 
     /**
@@ -107,7 +107,7 @@ public boolean isSuppressed() {
      * @return the color of the piece
      */
     public Color getColor() {
-        return Color.values()[color];
+        return color;
     }
 
     /**