diff --git a/python/templates/selection.xml.jinja2 b/python/templates/selection.xml.jinja2
index 00b52c78a..9926fd483 100644
--- a/python/templates/selection.xml.jinja2
+++ b/python/templates/selection.xml.jinja2
@@ -1,10 +1,11 @@
-{% macro class_selection(class, prefix='', postfix='') %}
-{%- if class.namespace %}
-
-{%- else %}
-
-{%- endif %}
-{% endmacro %}
+{%- macro class_selection(class, prefix='', postfix='', vector=False) %}
+{% set full_name = prefix + class.bare_type + postfix %}
+{% set namespace = class.namespace + '::' if class.namespace else '' %}
+
+{% if vector %}
+
+{%- endif -%}
+{%- endmacro -%}
{% macro ioread(iorule) %}
@@ -24,7 +25,7 @@
{% for class in datatypes %}
-{{ class_selection(class, postfix='Data') }}
+{{ class_selection(class, postfix='Data', vector=True) }}
{# We need to also create the collections in the selection xml file. #}
{# Otherwise the python interface does not work in gcc builds #}
{# Additionally, in order to allow "direct" access to the user facing classes #}