diff --git a/pom.xml b/pom.xml
index 85f10f6..e267284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
         <java.target.version>17</java.target.version>
         <jetbrains-annotations.version>24.0.1</jetbrains-annotations.version>
         <junit-jupiter.version>5.9.2</junit-jupiter.version>
-        <labyrinth-generator.version>0.0.5</labyrinth-generator.version>
+        <labyrinth-generator.version>0.0.6</labyrinth-generator.version>
         <logback.version>1.4.6</logback.version>
         <lombok.version>1.18.26</lombok.version>
         <slf4j.version>2.0.7</slf4j.version>
diff --git a/src/main/java/ch/fritteli/labyrinth/server/OutputType.java b/src/main/java/ch/fritteli/labyrinth/server/OutputType.java
index c1d08d9..77fd88b 100644
--- a/src/main/java/ch/fritteli/labyrinth/server/OutputType.java
+++ b/src/main/java/ch/fritteli/labyrinth/server/OutputType.java
@@ -2,6 +2,7 @@ package ch.fritteli.labyrinth.server;
 
 import ch.fritteli.labyrinth.generator.model.Labyrinth;
 import ch.fritteli.labyrinth.generator.renderer.html.HTMLRenderer;
+import ch.fritteli.labyrinth.generator.renderer.json.JsonRenderer;
 import ch.fritteli.labyrinth.generator.renderer.pdf.PDFRenderer;
 import ch.fritteli.labyrinth.generator.renderer.text.TextRenderer;
 import ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer;
@@ -28,6 +29,18 @@ public enum OutputType {
             false,
             "h",
             "html"),
+    JSON("application/json",
+            "json",
+            labyrinth -> JsonRenderer.newInstance().render(labyrinth).getBytes(StandardCharsets.UTF_8),
+            false,
+            "j",
+            "json"),
+    JSONFILE("application/json",
+            "json",
+            labyrinth -> JsonRenderer.newInstance().render(labyrinth).getBytes(StandardCharsets.UTF_8),
+            true,
+            "s",
+            "jsonfile"),
     PDF("application/pdf",
             "pdf",
             labyrinth -> PDFRenderer.newInstance().render(labyrinth).toByteArray(),