diff --git a/smartgears/gcubeapp-setup/defaults/main.yml b/smartgears/gcubeapp-setup/defaults/main.yml
index 845eeae0..c1ed1e70 100644
--- a/smartgears/gcubeapp-setup/defaults/main.yml
+++ b/smartgears/gcubeapp-setup/defaults/main.yml
@@ -2,5 +2,6 @@
 gcubeapp_setup: False
 
 #gcubeapp_webapps:
-#  - { webapp_name: '', version: '' }
+#  - { webapp_name: '', version: '', webapp_group: '', description: '', exclude_handlers: [ '' ] }
+
   
diff --git a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2 b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2
index db684863..d0a406f3 100644
--- a/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2
+++ b/smartgears/gcubeapp-setup/templates/gcube-app.xml.j2
@@ -3,10 +3,17 @@
         <name>{{ item.1.webapp_name }}</name>
         <group>{{ item.1.webapp_group }}</group>
         <version>{{ item.1.version }}</version>
+{% if item.1.description is defined %}
+        <description location="{{ item.1.description }}"/>
+{% endif %}
 {% if item.1.persistence_location is defined %}
         <persistence location="{{ item.1.persistence_location }}"/>
 {% endif %}
-        <exclude>/*</exclude>
+{% if item.1.exclude_handlers is defined %}
+{% for eh in exclude_handlers %}
+        <exclude {{ eh }}</exclude>
+{% endfor %}
+{% endif %}        
 
 </application>