diff --git a/SpongeAPI b/SpongeAPI
index a490075071b..545c471d497 160000
--- a/SpongeAPI
+++ b/SpongeAPI
@@ -1 +1 @@
-Subproject commit a490075071b22f7b6a51d92ed1dda84cae796ca5
+Subproject commit 545c471d497821c8f2fa8fd54e15075c19e53f05
diff --git a/generator/src/main/java/org/spongepowered/vanilla/generator/world/TagRegistries.java b/generator/src/main/java/org/spongepowered/vanilla/generator/world/TagRegistries.java
index 635f9efdb62..8c3e598c650 100644
--- a/generator/src/main/java/org/spongepowered/vanilla/generator/world/TagRegistries.java
+++ b/generator/src/main/java/org/spongepowered/vanilla/generator/world/TagRegistries.java
@@ -79,13 +79,40 @@ public static List<Generator> tagRegistries(final Context context) {
                 "tag",
                 "EnchantmentTypeTags"
             ),
-
             new TagGenerator(
                 "DAMAGE_TYPE",
                 Registries.DAMAGE_TYPE,
                 context.relativeClass("event.cause.entity.damage", "DamageType"),
                 "tag",
                 "DamageTypeTags"
+            ),
+            new TagGenerator(
+                "BANNER_PATTERN_SHAPE",
+                Registries.BANNER_PATTERN,
+                context.relativeClass("data.type", "BannerPatternShape"),
+                "tag",
+                "BannerPatternShapeTags"
+            ),
+            new TagGenerator(
+                "CAT_TYPE",
+                Registries.CAT_VARIANT,
+                context.relativeClass("data.type", "CatType"),
+                "tag",
+                "CatTypeTags"
+            ),
+            new TagGenerator(
+                "ART_TYPE",
+                Registries.PAINTING_VARIANT,
+                context.relativeClass("data.type", "ArtType"),
+                "tag",
+                "ArtTypeTags"
+            ),
+            new TagGenerator(
+                "STRUCTURE",
+                Registries.STRUCTURE,
+                context.relativeClass("world.generation.structure", "Structure"),
+                "tag",
+                "StructureTags"
             )
         );
     }