diff --git a/source/behavior/entities/1.8.0/entities.json b/source/behavior/entities/1.8.0/entities.json
deleted file mode 100644
index ffe2d891..00000000
--- a/source/behavior/entities/1.8.0/entities.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$id": "blockception.minecraft.behavior.entity.1.17.0",
-  "type": "object",
-  "title": "Entity Behavior 1.17.0",
-  "description": "The minecraft entity behavior specification",
-  "required": ["format_version", "minecraft:entity"],
-  "additionalProperties": false,
-  "properties": {
-    "format_version": {
-      "title": "1.17.0 Format Version",
-      "description": "A version that tells minecraft what type of data format can be expected when reading this file.",
-      "type": "string",
-      "const": "1.17.0"
-    },
-    "minecraft:entity": { "$ref": "./minecraft.entity.json" }
-  }
-}
diff --git a/source/behavior/entities/1.8.0/minecraft.entity.json b/source/behavior/entities/1.8.0/minecraft.entity.json
index 9ee76f55..1a3f6e8f 100644
--- a/source/behavior/entities/1.8.0/minecraft.entity.json
+++ b/source/behavior/entities/1.8.0/minecraft.entity.json
@@ -16,9 +16,10 @@
           "description": "Sets the mapping of internal animation / animation controllers references to actual animations. This is a JSON Object of name/animation pairs",
           "type": "object",
           "additionalProperties": {
-            "title": "Animation (controller)",
+            "title": "Animation / Controller",
             "description": "The name of the animation controller / animation",
-            "type": "string"
+            "type": "string",
+            "examples": ["animation.", "controller."]
           }
         },
         "identifier": {
diff --git a/source/behavior/entities/entities.json b/source/behavior/entities/entities.json
index f0a42093..17f80820 100644
--- a/source/behavior/entities/entities.json
+++ b/source/behavior/entities/entities.json
@@ -1,6 +1,5 @@
 {
   "$id": "blockception.minecraft.behavior.entities",
-  "required": ["format_version"],
   "examples": [
     {
       "format_version": "1.16.0",
@@ -12,19 +11,13 @@
       }
     }
   ],
-  "allOf": [
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.8.0" } } }, "then": { "$ref": "./1.8.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.10.0" } } }, "then": { "$ref": "./1.10.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.11.0" } } }, "then": { "$ref": "./1.11.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.12.0" } } }, "then": { "$ref": "./1.12.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.13.0" } } }, "then": { "$ref": "./1.13.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.14.0" } } }, "then": { "$ref": "./1.14.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.16.0" } } }, "then": { "$ref": "./1.16.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.16.100" } } }, "then": { "$ref": "./1.16.100/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.17.0" } } }, "then": { "$ref": "./1.17.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.17.10" } } }, "then": { "$ref": "./1.17.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.17.20" } } }, "then": { "$ref": "./1.17.0/entities.json" } },
-    { "if": { "properties": { "format_version": { "type": "string", "const": "1.17.30" } } }, "then": { "$ref": "./1.17.0/entities.json" } },
-    { "properties": { "format_version": { "$ref": "../../general/format_version.json" } } }
-  ]
+  "type": "object",
+  "title": "Entity Behavior 1.17.0",
+  "description": "The minecraft entity behavior specification",
+  "required": ["format_version", "minecraft:entity"],
+  "additionalProperties": false,
+  "properties": {
+    "format_version": { "$ref": "../../general/format_version.json" },
+    "minecraft:entity": { "$ref": "./minecraft.entity.json" }
+  }
 }