diff --git a/grafana_dashboards/schema/template/__init__.py b/grafana_dashboards/schema/template/__init__.py
index a2858bf..0d958be 100644
--- a/grafana_dashboards/schema/template/__init__.py
+++ b/grafana_dashboards/schema/template/__init__.py
@@ -25,20 +25,18 @@ from grafana_dashboards.schema.template.query import Query
 class Template(object):
 
     def __init__(self):
-        # TODO(pabelanger): This is pretty ugly, there much be a better way to
-        # set default values.
-        self.defaults = {
-            'enabled': False,
-            'list': [],
-        }
+        self.defaults = []
 
     def _validate(self):
 
         def f(data):
-            res = self.defaults
             if not isinstance(data, list):
                 raise v.Invalid('Should be a list')
 
+            res = {
+                'enabled': False,
+                'list': []
+            }
             for template in data:
                 res['enabled'] = True
                 validate = Base().get_schema()
diff --git a/requirements.txt b/requirements.txt
index 23564cc..39dfcb2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,4 +4,4 @@ python-slugify
 PyYAML>=3.1.0
 requests
 six>=1.6.0
-voluptuous<=0.10.5
+voluptuous>0.10.5