diff --git a/templates/classes.html.j2 b/templates/classes.html.j2
index 268541f..78af19b 100644
--- a/templates/classes.html.j2
+++ b/templates/classes.html.j2
@@ -26,6 +26,7 @@
         <tr>
             <th>Property Name</th>
             <th>Type</th>
+            <th>Kind</th>
             <th>Multiplicity</th>
             <th>Description</th>
         </tr>
@@ -38,8 +39,10 @@
                 {% if property.type.__class__ == object.__class__ %}
                     <a href="/classes/{{ property.type.uuid }}">{{ property.type.name }}</a>
                 {% else %}
-                    {{ property.type.name }}</td>
+                    {{ property.type.name }}
                 {% endif %}
+            </td>
+            <td>{{ property.kind }}</td>
             <td>{{ property.min_card.value }} .. {{ property.max_card.value }}</td>
             <td>{% if property.description %}
             {{ property.description }}
diff --git a/templates/system-definition.yaml b/templates/system-definition.yaml
index a00c9b0..8c95d01 100644
--- a/templates/system-definition.yaml
+++ b/templates/system-definition.yaml
@@ -11,4 +11,4 @@ variable:
     type: SystemComponent
     below: sa
 filters:
-    name: "System"
+    is_actor: false