diff --git a/source/behavior/blocks/format/events/set_block.json b/source/behavior/blocks/format/events/set_block.json
index 04ee9b3b..62f504a6 100644
--- a/source/behavior/blocks/format/events/set_block.json
+++ b/source/behavior/blocks/format/events/set_block.json
@@ -4,5 +4,12 @@
   "description": "Sets this block to another block type.",
   "title": "Set Block",
   "additionalProperties": false,
-  "properties": { "block_type": { "type": "string", "default": "", "description": "The type of block to set.", "title": "Block Type" } }
+  "properties": {
+    "block_type": {
+      "$ref": "../../../../general/block/reference.json",
+      "default": "",
+      "description": "The type of block to set.",
+      "title": "Block Type"
+    }
+  }
 }
diff --git a/source/behavior/blocks/format/events/set_block_at_pos.json b/source/behavior/blocks/format/events/set_block_at_pos.json
index 25a28d9b..4c381958 100644
--- a/source/behavior/blocks/format/events/set_block_at_pos.json
+++ b/source/behavior/blocks/format/events/set_block_at_pos.json
@@ -16,6 +16,11 @@
         { "type": "number", "title": "Z", "description": "The z offset from the block's center." }
       ]
     },
-    "block_type": { "type": "string", "default": "", "description": "The type of block to set.", "title": "Block Type" }
+    "block_type": {
+      "$ref": "../../../../general/block/reference.json",
+      "default": "",
+      "description": "The type of block to set.",
+      "title": "Block Type"
+    }
   }
 }
diff --git a/source/behavior/entities/format/behaviors/raid_garden.json b/source/behavior/entities/format/behaviors/raid_garden.json
index 7af80bde..ae26e822 100644
--- a/source/behavior/entities/format/behaviors/raid_garden.json
+++ b/source/behavior/entities/format/behaviors/raid_garden.json
@@ -16,7 +16,7 @@
         "type": "string",
         "title": "Block Id",
         "description": "A block identifier.",
-        "$ref": "../../../../general/item/descriptor.json"
+        "$ref": "../../../../general/block/reference.json"
       }
     },
     "eat_delay": {
diff --git a/source/behavior/entities/format/components/ageable.json b/source/behavior/entities/format/components/ageable.json
index 8c36115c..b1026ea3 100644
--- a/source/behavior/entities/format/components/ageable.json
+++ b/source/behavior/entities/format/components/ageable.json
@@ -11,12 +11,12 @@
         {
           "type": "array",
           "items": {
-            "$ref": "../../../../general/item/identifier.json"
+            "$ref": "../../../../general/item/descriptor.json"
           }
         },
         {
           "type": "string",
-          "$ref": "../../../../general/item/identifier.json"
+          "$ref": "../../../../general/item/descriptor.json"
         }
       ],
       "title": "Drop Items"
@@ -44,7 +44,7 @@
                     "type": "number"
                   },
                   "item": {
-                    "$ref": "../../../../general/item/identifier.json"
+                    "$ref": "../../../../general/item/descriptor.json"
                   }
                 }
               }
@@ -64,7 +64,7 @@
       "title": "Grow Up"
     },
     "transform_to_item": {
-      "type": "string",
+      "$ref": "../../../../general/item/descriptor.json",
       "title": "Transform To Item",
       "description": "The feed item used will transform to this item upon successful interaction. Format: itemName:auxValue"
     }
diff --git a/source/behavior/entities/format/components/boostable.json b/source/behavior/entities/format/components/boostable.json
index 6d7405d4..ee01edc6 100644
--- a/source/behavior/entities/format/components/boostable.json
+++ b/source/behavior/entities/format/components/boostable.json
@@ -32,14 +32,20 @@
             "description": "This is the damage that the item will take each time it is used.",
             "title": "Damage"
           },
+          "item_damage": {
+            "type": "integer",
+            "default": 1,
+            "description": "UNDOCUMENTED.",
+            "title": "Item Damage"
+          },
           "item": {
-            "type": "string",
+            "$ref": "../../../../general/item/descriptor.json",
             "default": "",
             "description": "Name of the item that can be used to boost.",
             "title": "Item"
           },
           "replace_item": {
-            "type": "string",
+            "$ref": "../../../../general/item/descriptor.json",
             "default": "",
             "description": "The item used to boost will become this item once it is used up.",
             "title": "Replace Item"
diff --git a/source/behavior/entities/format/components/breathable.json b/source/behavior/entities/format/components/breathable.json
index 89c7190b..712f7d6f 100644
--- a/source/behavior/entities/format/components/breathable.json
+++ b/source/behavior/entities/format/components/breathable.json
@@ -58,7 +58,7 @@
       "type": "array",
       "description": "List of blocks this entity can breathe in, in addition to the above.",
       "items": {
-        "$ref": "../../../../general/block/identifier.json"
+        "$ref": "../../../../general/block/reference.json"
       },
       "title": "Breathe Blocks"
     },
@@ -66,7 +66,7 @@
       "type": "array",
       "description": "List of blocks this entity can't breathe in, in addition to the above.",
       "items": {
-        "$ref": "../../../../general/block/identifier.json"
+        "$ref": "../../../../general/block/reference.json"
       },
       "title": "Non Breathes Blocks"
     }
diff --git a/source/behavior/entities/format/components/breedable.json b/source/behavior/entities/format/components/breedable.json
index c279e7b4..1f76c7bd 100644
--- a/source/behavior/entities/format/components/breedable.json
+++ b/source/behavior/entities/format/components/breedable.json
@@ -40,14 +40,14 @@
               "items": {
                 "description": "A block type required nearby for the entity to breed.",
                 "type": "string",
-                "$ref": "../../../../general/blocks_item.json",
+                "$ref": "../../../../general/block/reference.json",
                 "title": "Blocks"
               }
             },
             {
               "description": "A block type required nearby for the entity to breed.",
               "type": "string",
-              "$ref": "../../../../general/blocks_item.json",
+              "$ref": "../../../../general/block/reference.json",
               "title": "Blocks"
             }
           ]
@@ -95,13 +95,13 @@
           "items": {
             "type": "string",
             "description": "An item that can be used to get the entity into the `love` state.",
-            "$ref": "../../../../general/item/identifier.json",
+            "$ref": "../../../../general/item/descriptor.json",
             "title": "Breed Item"
           }
         },
         {
           "type": "string",
-          "$ref": "../../../../general/item/identifier.json"
+          "$ref": "../../../../general/item/descriptor.json"
         }
       ]
     },
diff --git a/source/behavior/entities/format/components/buoyant.json b/source/behavior/entities/format/components/buoyant.json
index ddf75e48..1d0aeb16 100644
--- a/source/behavior/entities/format/components/buoyant.json
+++ b/source/behavior/entities/format/components/buoyant.json
@@ -46,8 +46,8 @@
       "description": "List of blocks this entity can float on. Must be a liquid block.",
       "title": "Liquid Blocks",
       "items": {
-        "type": "string",
-        "title": "Block ID"
+        "title": "Block",
+        "$ref": "../../../../general/block/reference.json"
       }
     },
     "simulate_waves": {
diff --git a/source/behavior/entities/format/components/equippable.json b/source/behavior/entities/format/components/equippable.json
index 9107ca99..03e06539 100644
--- a/source/behavior/entities/format/components/equippable.json
+++ b/source/behavior/entities/format/components/equippable.json
@@ -32,7 +32,7 @@
             }
           },
           "item": {
-            "$ref": "../../../../general/item/identifier.json",
+            "$ref": "../../../../general/item/descriptor.json",
             "description": "Identifier of the item that can be equipped for this slot.",
             "title": "Item"
           },
diff --git a/source/behavior/entities/format/components/healable.json b/source/behavior/entities/format/components/healable.json
index 8fb86d94..55d0671b 100644
--- a/source/behavior/entities/format/components/healable.json
+++ b/source/behavior/entities/format/components/healable.json
@@ -5,6 +5,33 @@
   "title": "Healable",
   "additionalProperties": false,
   "required": [],
+  "definitions": {
+    "effect": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "title": "Name",
+          "description": "UNDOCUMENTED.",
+          "$comment": "UNDOCUMENTED",
+          "type": "string"
+        },
+        "duration": {
+          "type": "integer",
+          "default": 0,
+          "minimum": 0,
+          "description": "The duration of the effect.",
+          "$comment": "UNDOCUMENTED"
+        },
+        "amplifier": {
+          "type": "integer",
+          "default": 0,
+          "minimum": 0,
+          "description": "The amplifier of the effect.",
+          "$comment": "UNDOCUMENTED"
+        }
+      }
+    }
+  },
   "properties": {
     "filters": {
       "$ref": "../../filters/filters.json"
@@ -33,9 +60,22 @@
             "title": "Heal Amount"
           },
           "item": {
-            "type": "string",
-            "description": "Item identifier that can be used to heal this entity.",
+            "$ref": "../../../../general/item/descriptor.json",
+            "description": "Item that can be used to heal this entity.",
             "title": "Item"
+          },
+          "effects": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/effect"
+              },
+              {
+                "type": "array",
+                "items": {
+                  "$ref": "#/definitions/effect"
+                }
+              }
+            ]
           }
         }
       }
diff --git a/source/behavior/entities/format/components/npc.json b/source/behavior/entities/format/components/npc.json
index 31c41ead..47771b29 100644
--- a/source/behavior/entities/format/components/npc.json
+++ b/source/behavior/entities/format/components/npc.json
@@ -92,6 +92,13 @@
                 "$comment": "UNDOCUMENTED",
                 "type": "integer",
                 "minimum": 0
+              },
+              "mark_variant": {
+                "title": "Mark Variant",
+                "description": "UNDOCUMENTED.",
+                "$comment": "UNDOCUMENTED",
+                "type": "integer",
+                "minimum": 0
               }
             }
           }
diff --git a/source/behavior/entities/format/components/preferred_path.json b/source/behavior/entities/format/components/preferred_path.json
index 969b7e15..71b03261 100644
--- a/source/behavior/entities/format/components/preferred_path.json
+++ b/source/behavior/entities/format/components/preferred_path.json
@@ -38,7 +38,7 @@
           "blocks": {
             "type": "array",
             "items": {
-              "$ref": "../../../../general/blocks_item.json"
+              "$ref": "../../../../general/block/reference.json"
             }
           }
         }
diff --git a/source/behavior/entities/format/components/spawn_entity.json b/source/behavior/entities/format/components/spawn_entity.json
index 55e64952..43c810df 100644
--- a/source/behavior/entities/format/components/spawn_entity.json
+++ b/source/behavior/entities/format/components/spawn_entity.json
@@ -57,7 +57,7 @@
           "title": "Spawn Event"
         },
         "spawn_item": {
-          "type": "string",
+          "$ref": "../../../../general/item/descriptor.json",
           "default": "egg",
           "description": "Item identifier of the item to spawn.",
           "title": "Spawn Item"
diff --git a/source/behavior/entities/format/components/tamemount.json b/source/behavior/entities/format/components/tamemount.json
index 43fa3f23..4237832f 100644
--- a/source/behavior/entities/format/components/tamemount.json
+++ b/source/behavior/entities/format/components/tamemount.json
@@ -10,7 +10,7 @@
       "description": "The list of items that can be used to increase the entity's temper and speed up the taming process.",
       "properties": {
         "item": {
-          "$ref": "../../../../general/item/identifier.json",
+          "$ref": "../../../../general/item/descriptor.json",
           "description": "Name of the item this entity likes and can be used to increase this entity's temper.",
           "title": "Item"
         },
@@ -27,7 +27,7 @@
       "description": "The list of items that this entity dislikes and will cause it to get angry if used while untamed.",
       "properties": {
         "item": {
-          "$ref": "../../../../general/item/identifier.json",
+          "$ref": "../../../../general/item/descriptor.json",
           "description": "Name of the item this entity dislikes and will cause it to get angry if used while untamed."
         }
       }
diff --git a/source/behavior/entities/format/types/entity_types.json b/source/behavior/entities/format/types/entity_types.json
index ca412df1..9d052e60 100644
--- a/source/behavior/entities/format/types/entity_types.json
+++ b/source/behavior/entities/format/types/entity_types.json
@@ -15,6 +15,26 @@
           "default": 16,
           "title": "Maximum Dist"
         },
+        "max_height": {
+          "type": "number",
+          "description": "UNDOCUMENTED.",
+          "title": "Maximum Height"
+        },
+        "max_flee": {
+          "type": "number",
+          "description": "UNDOCUMENTED.",
+          "title": "Maximum Height"
+        },
+        "priority": {
+          "type": "number",
+          "description": "UNDOCUMENTED.",
+          "title": "Priority"
+        },
+        "check_if_outnumbered": {
+          "type": "number",
+          "description": "UNDOCUMENTED.",
+          "title": "Check If Outnumbered"
+        },
         "must_see": {
           "type": "boolean",
           "description": "If true, the mob has to be visible to be a valid choice.",
diff --git a/source/general/block/reference.json b/source/general/block/reference.json
index eaf10b50..13d0401f 100644
--- a/source/general/block/reference.json
+++ b/source/general/block/reference.json
@@ -26,6 +26,11 @@
             "title": "State Value",
             "description": "The key of property is the name of the block state/property, the value must be the same as the block properties accepted values."
           }
+        },
+        "tags": {
+          "$ref": "../../molang/string.json",
+          "description": "[UNDOCUMENTED] A Molang expression ran against a block to match.",
+          "examples": ["query.any_tag('wood')"]
         }
       }
     }
diff --git a/source/general/item/descriptor.json b/source/general/item/descriptor.json
index 2be96f84..e3cd888b 100644
--- a/source/general/item/descriptor.json
+++ b/source/general/item/descriptor.json
@@ -28,7 +28,7 @@
       "type": "object",
       "properties": {
         "tags": {
-          "type": "string",
+          "$ref": "../../molang/string.json",
           "description": "[UNDOCUMENTED] A Molang expression ran against item or block to match.",
           "examples": ["query.any_tag('minecraft:is_tool')"]
         },