diff --git a/pkgs/clan-cli/clan_cli/inventory/classes.py b/pkgs/clan-cli/clan_cli/inventory/classes.py
index 87d8f8483..296230db8 100644
--- a/pkgs/clan-cli/clan_cli/inventory/classes.py
+++ b/pkgs/clan-cli/clan_cli/inventory/classes.py
@@ -36,4 +36,4 @@ class Inventory:
     meta: Meta
     machines: dict[str, Machine] = field(default_factory = dict)
     services: dict[str, Service] = field(default_factory = dict)
-    tags: dict[str, list[Any]] = field(default_factory = dict)
+    tags: dict[str, list[str]] = field(default_factory = dict)
diff --git a/pkgs/classgen/main.py b/pkgs/classgen/main.py
index be0000bc0..92c56a65e 100644
--- a/pkgs/classgen/main.py
+++ b/pkgs/classgen/main.py
@@ -24,7 +24,10 @@ def map_json_type(
             res |= map_json_type(t)
         return res
     if isinstance(json_type, dict):
-        return map_json_type(json_type.get("type"))
+        items = json_type.get("items")
+        if items:
+            nested_types = map_json_type(items)
+        return map_json_type(json_type.get("type"), nested_types)
     if json_type == "string":
         return {"str"}
     if json_type == "integer":