diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt2.java b/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt2.java
index 27ea765..f25ccc1 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt2.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt2.java
@@ -29,36 +29,12 @@ public enum DiagArt2 {
     }
 
     public static DiagArt2 parseString(String s) {
-        switch (s) {
-            case "A":
-                return A;
-            case "AD":
-                return AD;
-            case "BD":
-                return BD;
-            case "ED":
-                return ED;
-            case "EL":
-                return EL;
-            case "F":
-                return F;
-            case "ND":
-                return ND;
-            case "NO":
-                return NO;
-            case "NU":
-                return NU;
-            case "UD":
-                return UD;
-            case "VO":
-                return VO;
-            case "W":
-                return W;
-            case "ZD":
-                return ZD;
-            default:
-                return U;
+        for (DiagArt2 diagart2 : DiagArt2.values()) {
+            if (diagart2.id.equalsIgnoreCase(s)) {
+                return diagart2;
+            }
         }
+        return U;
     }
 
     @Override