diff --git a/schemas/1.16.json b/schemas/1.16.json
index abedf695..4c22c018 100644
--- a/schemas/1.16.json
+++ b/schemas/1.16.json
@@ -2106,6 +2106,7 @@
       "minecraft:armor_stand",
       "minecraft:arrow",
       "minecraft:bat",
+      "minecraft:bee",
       "minecraft:blaze",
       "minecraft:boat",
       "minecraft:cat",
@@ -2141,6 +2142,7 @@
       "minecraft:ghast",
       "minecraft:giant",
       "minecraft:guardian",
+      "minecraft:hoglin",
       "minecraft:hopper_minecart",
       "minecraft:horse",
       "minecraft:husk",
@@ -2162,6 +2164,7 @@
       "minecraft:parrot",
       "minecraft:phantom",
       "minecraft:pig",
+      "minecraft:piglin",
       "minecraft:pillager",
       "minecraft:player",
       "minecraft:polar_bear",
@@ -2185,6 +2188,7 @@
       "minecraft:spider",
       "minecraft:squid",
       "minecraft:stray",
+      "minecraft:strider",
       "minecraft:tnt",
       "minecraft:tnt_minecart",
       "minecraft:trader_llama",
@@ -2200,18 +2204,18 @@
       "minecraft:wither_skeleton",
       "minecraft:wither_skull",
       "minecraft:wolf",
+      "minecraft:zoglin",
       "minecraft:zombie",
       "minecraft:zombie_horse",
-      "minecraft:zombie_pigman",
-      "minecraft:zombie_villager"
+      "minecraft:zombie_villager",
+      "minecraft:zombified_piglin"
     ],
     "enchantments": [
       "minecraft:aqua_affinity",
       "minecraft:bane_of_arthropods",
+      "minecraft:binding_curse",
       "minecraft:blast_protection",
       "minecraft:channeling",
-      "minecraft:binding_curse",
-      "minecraft:vanishing_curse",
       "minecraft:depth_strider",
       "minecraft:efficiency",
       "minecraft:feather_falling",
@@ -2240,19 +2244,23 @@
       "minecraft:sharpness",
       "minecraft:silk_touch",
       "minecraft:smite",
+      "minecraft:soul_speed",
       "minecraft:sweeping",
       "minecraft:thorns",
-      "minecraft:unbreaking"
+      "minecraft:unbreaking",
+      "minecraft:vanishing_curse"
     ],
     "biomes": [
       "minecraft:badlands",
       "minecraft:badlands_plateau",
       "minecraft:bamboo_jungle",
       "minecraft:bamboo_jungle_hills",
+      "minecraft:basalt_deltas",
       "minecraft:beach",
       "minecraft:birch_forest",
       "minecraft:birch_forest_hills",
       "minecraft:cold_ocean",
+      "minecraft:crimson_forest",
       "minecraft:dark_forest",
       "minecraft:dark_forest_hills",
       "minecraft:deep_cold_ocean",
@@ -2290,7 +2298,7 @@
       "minecraft:mountains",
       "minecraft:mushroom_field_shore",
       "minecraft:mushroom_fields",
-      "minecraft:nether",
+      "minecraft:nether_wastes",
       "minecraft:ocean",
       "minecraft:plains",
       "minecraft:river",
@@ -2305,6 +2313,7 @@
       "minecraft:snowy_taiga_hills",
       "minecraft:snowy_taiga_mountains",
       "minecraft:snowy_tundra",
+      "minecraft:soul_sand_valley",
       "minecraft:stone_shore",
       "minecraft:sunflower_plains",
       "minecraft:swamp",
@@ -2317,26 +2326,30 @@
       "minecraft:the_end",
       "minecraft:the_void",
       "minecraft:warm_ocean",
+      "minecraft:warped_forest",
       "minecraft:wooded_badlands_plateau",
       "minecraft:wooded_hills",
       "minecraft:wooded_mountains"
     ],
     "structures": [
-      "pillager_outpost",
-      "mineshaft",
-      "mansion",
-      "jungle_pyramid",
-      "desert_pyramid",
-      "igloo",
-      "shipwreck",
-      "swamp_hut",
-      "stronghold",
-      "monument",
-      "ocean_ruin",
-      "fortress",
-      "endcity",
-      "buried_treasure",
-      "village"
+      "minecraft:bastion_remnant",
+      "minecraft:buried_treasure",
+      "minecraft:desert_pyramid",
+      "minecraft:endcity",
+      "minecraft:fortress",
+      "minecraft:igloo",
+      "minecraft:jungle_pyramid",
+      "minecraft:mansion",
+      "minecraft:mineshaft",
+      "minecraft:monument",
+      "minecraft:nether_fossil",
+      "minecraft:ocean_ruin",
+      "minecraft:pillager_outpost",
+      "minecraft:ruined_portal",
+      "minecraft:shipwreck",
+      "minecraft:stronghold",
+      "minecraft:swamp_hut",
+      "minecraft:village"
     ],
     "dimensions": [
       "minecraft:overworld",
@@ -2344,38 +2357,38 @@
       "minecraft:the_end"
     ],
     "status_effects": [
-      "minecraft:speed",
-      "minecraft:slowness",
-      "minecraft:haste",
-      "minecraft:mining_fatigue",
-      "minecraft:strength",
-      "minecraft:instant_health",
-      "minecraft:instant_damage",
-      "minecraft:jump_boost",
-      "minecraft:nausea",
-      "minecraft:regeneration",
-      "minecraft:resistance",
-      "minecraft:fire_resistance",
-      "minecraft:water_breathing",
-      "minecraft:invisibility",
-      "minecraft:blindness",
-      "minecraft:night_vision",
-      "minecraft:hunger",
-      "minecraft:weakness",
-      "minecraft:poison",
-      "minecraft:wither",
-      "minecraft:health_boost",
       "minecraft:absorption",
-      "minecraft:saturation",
-      "minecraft:glowing",
-      "minecraft:levitation",
-      "minecraft:luck",
-      "minecraft:unluck",
-      "minecraft:slow_falling",
+      "minecraft:bad_omen",
+      "minecraft:blindness",
       "minecraft:conduit_power",
       "minecraft:dolphins_grace",
-      "minecraft:bad_omen",
-      "minecraft:hero_of_the_village"
+      "minecraft:fire_resistance",
+      "minecraft:glowing",
+      "minecraft:haste",
+      "minecraft:health_boost",
+      "minecraft:hero_of_the_village",
+      "minecraft:hunger",
+      "minecraft:instant_damage",
+      "minecraft:instant_health",
+      "minecraft:invisibility",
+      "minecraft:jump_boost",
+      "minecraft:levitation",
+      "minecraft:luck",
+      "minecraft:mining_fatigue",
+      "minecraft:nausea",
+      "minecraft:night_vision",
+      "minecraft:poison",
+      "minecraft:regeneration",
+      "minecraft:resistance",
+      "minecraft:saturation",
+      "minecraft:slow_falling",
+      "minecraft:slowness",
+      "minecraft:speed",
+      "minecraft:strength",
+      "minecraft:unluck",
+      "minecraft:water_breathing",
+      "minecraft:weakness",
+      "minecraft:wither"
     ],
     "map_icons": [
       "mansion",
diff --git a/schemas/worldgen.json b/schemas/worldgen.json
index eb17b1c7..23b597f0 100644
--- a/schemas/worldgen.json
+++ b/schemas/worldgen.json
@@ -738,10 +738,12 @@
       "minecraft:badlands_plateau",
       "minecraft:bamboo_jungle",
       "minecraft:bamboo_jungle_hills",
+      "minecraft:basalt_deltas",
       "minecraft:beach",
       "minecraft:birch_forest",
       "minecraft:birch_forest_hills",
       "minecraft:cold_ocean",
+      "minecraft:crimson_forest",
       "minecraft:dark_forest",
       "minecraft:dark_forest_hills",
       "minecraft:deep_cold_ocean",
@@ -779,7 +781,7 @@
       "minecraft:mountains",
       "minecraft:mushroom_field_shore",
       "minecraft:mushroom_fields",
-      "minecraft:nether",
+      "minecraft:nether_wastes",
       "minecraft:ocean",
       "minecraft:plains",
       "minecraft:river",
@@ -794,6 +796,7 @@
       "minecraft:snowy_taiga_hills",
       "minecraft:snowy_taiga_mountains",
       "minecraft:snowy_tundra",
+      "minecraft:soul_sand_valley",
       "minecraft:stone_shore",
       "minecraft:sunflower_plains",
       "minecraft:swamp",
@@ -806,6 +809,7 @@
       "minecraft:the_end",
       "minecraft:the_void",
       "minecraft:warm_ocean",
+      "minecraft:warped_forest",
       "minecraft:wooded_badlands_plateau",
       "minecraft:wooded_hills",
       "minecraft:wooded_mountains"