diff --git a/control/templates/fan_zone_defs.mako.cpp b/control/templates/fan_zone_defs.mako.cpp
index cb46986..e05d1fc 100644
--- a/control/templates/fan_zone_defs.mako.cpp
+++ b/control/templates/fan_zone_defs.mako.cpp
@@ -54,13 +54,15 @@
                                 %for p in i['props']:
                     ZoneHandler{
                         make_zoneHandler(handler::setZoneProperty(
-                            &Zone::${p['name']},
+                            "${i['name']}",
+                            "${p['name']}",
+                            &Zone::${p['func']},
                             static_cast<${p['type']}>(
                                 %if "vector" in p['type'] or "map" in p['type']:
                                 ${p['type']}{
                                 %endif
-                                %for i, v in enumerate(p['values']):
-                                %if (i+1) != len(p['values']):
+                                %for j, v in enumerate(p['values']):
+                                %if (j+1) != len(p['values']):
                                     ${v},
                                 %else:
                                     ${v}
@@ -69,7 +71,8 @@
                                 %if "vector" in p['type'] or "map" in p['type']:
                                 }
                                 %endif
-                            )
+                            ),
+                            ${p['persist']}
                         ))
                     },
                                 %endfor