diff --git a/js/wizardwidget.js b/js/wizardwidget.js
index ee23e38..8e4b8e8 100644
--- a/js/wizardwidget.js
+++ b/js/wizardwidget.js
@@ -4,7 +4,6 @@ $(document).ready(function () {
 
     //Wizard
     $('a[data-toggle="tab"]').on('show.bs.tab', function (e) {
-
         var $target = $(e.target);
 
         if ($target.parent().hasClass('disabled')) {
@@ -12,24 +11,59 @@ $(document).ready(function () {
         }
     });
 
-    $(".next-step").click(function (e) {
+    // Manage next step button click
+    $(document).on("click", ".next-step", function (e) {
+        var $tab_active = $('.wizard .nav-tabs li.active');
+        var $next_tab = $active.next();
+        var $function = jQuery(this).data('function') || false;
 
-        var $active = $('.wizard .nav-tabs li.active');
-        $active.next().removeClass('disabled');
-        nextTab($active);
+        if ($function){
+            var callback = function(){
+                $next_tab.removeClass('disabled');
+                nextTab($tab_active);
+            };
 
+            // Execute data item 'function' on click
+            eval($function);
+        } else {
+            $next_tab.removeClass('disabled');
+            nextTab($tab_active);
+        }
     });
-    $(".prev-step").click(function (e) {
 
-        var $active = $('.wizard .nav-tabs li.active');
-        prevTab($active);
+    // Manage previous step button click
+    $(document).on("click", ".prev-step", function (e) {
+        var $tab_active = $('.wizard .nav-tabs li.active');
+        var $function = jQuery(this).data('function') || false;
+
+        if ($function){
+            var callback = function(){
+                prevTab($tab_active);
+            };
+
+            // Execute data item 'function' on click
+            eval($function);
+        } else {
+            prevTab($tab_active);
+        }
+    });
 
+    // Manage save step button click
+    $(document).on("click", ".save-step", function (e) {
+        var $function = jQuery(this).data('function') || false;
+        // Execute data item 'function' on click
+        if ($function){
+            eval($function);
+        }
     });
 });
 
+// 'click' on next tab
 function nextTab(elem) {
     $(elem).next().find('a[data-toggle="tab"]').click();
 }
+
+// 'click' on prev tab
 function prevTab(elem) {
     $(elem).prev().find('a[data-toggle="tab"]').click();
 }
\ No newline at end of file