diff --git a/Targets/Nfsshare-Custom.pm.new b/Targets/Nfsshare-Custom.pm.new
index 3da8bda..76d7f77 100644
--- a/Targets/Nfsshare-Custom.pm.new
+++ b/Targets/Nfsshare-Custom.pm.new
@@ -2,7 +2,7 @@
 # Routines to be edited by the developer to provide validation for parameters
 # and provison of the control data for table(s)
 #
-# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-06-29 11:35 
+# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-09-03 13:54 
 #
 
 use esmith::util;
diff --git a/Targets/Nfsshare.pm b/Targets/Nfsshare.pm
index a594087..756fced 100644
--- a/Targets/Nfsshare.pm
+++ b/Targets/Nfsshare.pm
@@ -1,6 +1,6 @@
 package SrvMngr::Controller::Nfsshare;
 #
-# Generated by version:SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-06-29 11:35 
+# Generated by version:SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-09-03 13:54 
 #
 #----------------------------------------------------------------------
 # heading     : Network
@@ -78,7 +78,7 @@ sub main {
     
 
 	# and table control fields
-    	$c->stash(ibays=>get_ibays($c));
+    	$c->stash(ibays=>$c->get_ibays());
 	
 	
     $c->stash(
@@ -141,13 +141,13 @@ sub do_update {
     
 		if ($trt eq 'PARAMS'){
 			#Validate form parameters for panel PARAMS
-			$ret = validate_PARAMS($c,\%nfs_data);
+			$ret = $c->validate_PARAMS(\%nfs_data);
 			$thispanel = 'PARAMS';
 		}
 	
 		if ($trt eq 'TABLE'){
 			#Validate form parameters for panel TABLE
-			$ret = validate_TABLE($c,\%nfs_data);
+			$ret = $c->validate_TABLE(\%nfs_data);
 			$thispanel = 'TABLE';
 		}
 	
@@ -161,7 +161,7 @@ sub do_update {
 		
 			if ($trt eq 'PARAMS'){
 				#do whatever is required ...
-				$ret = perform_PARAMS($c,\%nfs_data);
+				$ret = $c->perform_PARAMS(\%nfs_data);
 				if ($ret ne "ok") {
 					# return to the panel with error message
 					$c->stash(error => $c->l($ret));
@@ -173,7 +173,7 @@ sub do_update {
 		
 			if ($trt eq 'TABLE'){
 				#do whatever is required ...
-				$ret = perform_TABLE($c,\%nfs_data);
+				$ret = $c->perform_TABLE(\%nfs_data);
 				if ($ret ne "ok") {
 					# return to the panel with error message
 					$c->stash(error => $c->l($ret));
@@ -241,12 +241,12 @@ sub do_display {
     
 		if ($trt eq 'PARAMS'){
 			#Validate form parameters for panel PARAMS
-				%selectedrow = get_selected_PARAMS($c,$nfs_data{'Selected'},$is_new_record);
+				%selectedrow = $c->get_selected_PARAMS($nfs_data{'Selected'},$is_new_record);
 		}
 	
 		if ($trt eq 'TABLE'){
 			#Validate form parameters for panel TABLE
-				%selectedrow = get_selected_TABLE($c,$nfs_data{'Selected'},$is_new_record);
+				%selectedrow = $c->get_selected_TABLE($nfs_data{'Selected'},$is_new_record);
 		}
 	
  
diff --git a/Targets/_nfs_PARAMS.html.ep b/Targets/_nfs_PARAMS.html.ep
index 15da969..9d33b78 100644
--- a/Targets/_nfs_PARAMS.html.ep
+++ b/Targets/_nfs_PARAMS.html.ep
@@ -1,5 +1,5 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-06-29 11:35 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-09-03 13:54 
 %#
 <div id="Nfsshare-PARAMS" class="partial Nfsshare-PARAMS">
   <script>
diff --git a/Targets/_nfs_TABLE.html.ep b/Targets/_nfs_TABLE.html.ep
index fc05b95..8d5f70b 100644
--- a/Targets/_nfs_TABLE.html.ep
+++ b/Targets/_nfs_TABLE.html.ep
@@ -1,5 +1,5 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-06-29 11:35 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-09-03 13:54 
 %#
 <div id="Nfsshare-TABLE" class="partial Nfsshare-TABLE">
   <script>
diff --git a/Targets/nfsshare.html.ep b/Targets/nfsshare.html.ep
index db864d0..76fd0b7 100644
--- a/Targets/nfsshare.html.ep
+++ b/Targets/nfsshare.html.ep
@@ -1,6 +1,6 @@
 % layout 'default', title => "Sme server 2 - NFS data share", share_dir => './';
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-06-29 11:35 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.10.12  at 2024-09-03 13:54 
 %#
 % content_for 'module' => begin
 <div id="module" class="module Nfsshare-panel">
diff --git a/Targets/nfsshare_en.lex b/Targets/nfsshare_en.lex
index 472d2d9..09d2391 100644
--- a/Targets/nfsshare_en.lex
+++ b/Targets/nfsshare_en.lex
@@ -1,28 +1,28 @@
+'nfs_Save' => 'Save',
+'nfs_EnableShare_on_local_network' => 'Enableshare on local network',
+'nfs_NFS_data_share' => 'NFS data share',
+'nfs_Set_the_uid_and_gid' => 'Set the uid and gid if you want all requests appear to be from one user or one group, Otherwise leave blank',
+'nfs_Hello_PARAMS' => 'Hello PARAMS',
+'nfs_These_parameters_will_be_effective' => 'These parameters will be effective only if the share is enabled.  The share is in /home/e-smith/files/ibays//files',
+'nfs_For_writing_permissions,allowing_the_root' => 'For writing permissions, Allowing the root user and using insecure ports, You must configure a list of one IP per line, Being part of the local network(s).  ',
 'nfs_APPLY' => 'Apply',
 'nfs_NFS_Client(s)_allowed' => 'NFS Client(s) allowed',
-'nfs_TABLE_panel_action_was_successful' => 'TABLE panel action was successful',
-'nfs_Share_owner_Group' => 'Share owner Group',
-'nfs_Information_Bay_name' => 'Information Bay name',
-'nfs_Write_(a)synchronously' => 'Write (a)synchronously',
-'nfs_Squash_the_power_of_users' => 'Squash the power of users',
-'nfs_For_writing_permissions,allowing_the_root' => 'For writing permissions, Allowing the root user and using insecure ports, You must configure a list of one IP per line, Being part of the local network(s).  ',
-'nfs_Hello_PARAMS' => 'Hello PARAMS',
-'nfs_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful',
-'nfs_Enable_the_NFS_Share' => 'Enable the NFS Share',
-'nfs_NFS_data_share' => 'NFS data share',
-'nfs_Set_the_UID.' => 'Set the UID.  ',
-'nfs_Manage_NFS_Ibay_settings:' => 'Manage NFS Ibay settings:',
 'nfs_Browse_the_parent_folders' => 'Browse the parent folders',
-'nfs_These_parameters_will_be_effective' => 'These parameters will be effective only if the share is enabled.  The share is in /home/e-smith/files/ibays//files',
-'nfs_Hello_TABLE' => 'Hello TABLE',
-'nfs_Description' => 'Description',
-'nfs_Set_the_uid_and_gid' => 'Set the uid and gid if you want all requests appear to be from one user or one group, Otherwise leave blank',
-'nfs_EnableShare_on_local_network' => 'Enableshare on local network',
-'nfs_Set_the_GID.' => 'Set the GID.  ',
-'nfs_Save' => 'Save',
-'nfs_Requests_on_secure_ports' => 'Requests on secure ports',
-'nfs_Action' => 'Action',
-'nfs_Delays_the_disk_writing' => 'Delays the disk writing',
-'Nfs_status' => 'Status',
+'nfs_TABLE_panel_action_was_successful' => 'TABLE panel action was successful',
+'nfs_Set_the_UID.' => 'Set the UID.  ',
 'nfs_Name' => 'Name',
+'nfs_Share_owner_Group' => 'Share owner Group',
+'Nfs_status' => 'Status',
+'nfs_Requests_on_secure_ports' => 'Requests on secure ports',
+'nfs_Enable_the_NFS_Share' => 'Enable the NFS Share',
+'nfs_Write_(a)synchronously' => 'Write (a)synchronously',
+'nfs_Hello_TABLE' => 'Hello TABLE',
+'nfs_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful',
+'nfs_Delays_the_disk_writing' => 'Delays the disk writing',
+'nfs_Manage_NFS_Ibay_settings:' => 'Manage NFS Ibay settings:',
+'nfs_Set_the_GID.' => 'Set the GID.  ',
+'nfs_Information_Bay_name' => 'Information Bay name',
+'nfs_Squash_the_power_of_users' => 'Squash the power of users',
+'nfs_Action' => 'Action',
+'nfs_Description' => 'Description',
 'nfs_File_system_permissions' => 'File system permissions',
diff --git a/Templates/controller.pm.tem b/Templates/controller.pm.tem
index 769c1b4..8dd521d 100644
--- a/Templates/controller.pm.tem
+++ b/Templates/controller.pm.tem
@@ -80,7 +80,7 @@ sub main {
 	</tal:block>
 
 	# and table control fields
-    <tal:block tal:repeat="tablecontrol tablecontrols">	$c->stash(${tablecontrol}=>get_${tablecontrol}($c));
+    <tal:block tal:repeat="tablecontrol tablecontrols">	$c->stash(${tablecontrol}=>$c->get_${tablecontrol}());
 	</tal:block>
 	
     $c->stash(
@@ -225,7 +225,7 @@ sub do_display {
     <tal:block tal:repeat="panel panels">
 		if ($trt eq '${panel}'){
 			#Validate form parameters for panel ${panel}
-				%selectedrow = get_selected_${panel}($c,$$${prefix}_data{'Selected'},$is_new_record);
+				%selectedrow = $c->get_selected_${panel}($$${prefix}_data{'Selected'},$is_new_record);
 		}
 	</tal:block>