diff --git a/_includes/properties.html b/_includes/properties.html
index 19de8d0f..d0f93d61 100644
--- a/_includes/properties.html
+++ b/_includes/properties.html
@@ -6,10 +6,14 @@ <h3></h3>
   {{page.description}}
 </p>
 
-{% if page.expected_values %}
+{% if page.expected_values_as_type or page.expected_values_as_data %}
 <h4>Expected values</h4>
 <ul>
-  {% for v in page.expected_values %}
+  {% for v in page.expected_values_as_type %}
+  {%- assign typeName = '/types/' | append: v %}
+  <li><a href="{{ typeName | relative_url }}">{{ v }}</a></li>
+  {% endfor %}
+  {% for v in page.expected_values_as_data %}
   <li>
     {{v}}
   </li>
diff --git a/pages/_properties/input.html b/pages/_properties/input.html
index 507acd44..8bf6ba3b 100644
--- a/pages/_properties/input.html
+++ b/pages/_properties/input.html
@@ -3,9 +3,12 @@
 prop_name: input
 description: a property aimed at specifying the type of consumed data.
 
-expected_values:
+expected_values_as_type :
 - FormalParameter
 
+# expected_values_as_data :
+# - text
+
 # used_in_types:
 # -
 
diff --git a/pages/_properties/output.html b/pages/_properties/output.html
index d6c8dac4..6c3725c9 100644
--- a/pages/_properties/output.html
+++ b/pages/_properties/output.html
@@ -3,9 +3,12 @@
 prop_name: output
 description: a property aimed at specifying the type of produced data.
 
-expected_values:
+expected_values_as_type :
 - FormalParameter
 
+# expected_values_as_data :
+# - text
+
 # used_in_types:
 # -