diff --git a/src/java/fr/paris/lutece/plugins/pluginwizard/business/ConfigurationKeyDAO.java b/src/java/fr/paris/lutece/plugins/pluginwizard/business/ConfigurationKeyDAO.java
index ca5a3d5f..5d21b515 100644
--- a/src/java/fr/paris/lutece/plugins/pluginwizard/business/ConfigurationKeyDAO.java
+++ b/src/java/fr/paris/lutece/plugins/pluginwizard/business/ConfigurationKeyDAO.java
@@ -74,7 +74,6 @@ public int newPrimaryKey( Plugin plugin )
             }
 
             nKey = daoUtil.getInt( 1 ) + 1;
-            daoUtil.free( );
 
             return nKey;
         }
@@ -100,7 +99,6 @@ public void insert( ConfigurationKey configurationKey, Plugin plugin )
             daoUtil.setString( 3, configurationKey.getKeyValue( ) );
 
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -131,8 +129,6 @@ public ConfigurationKey load( int nId, Plugin plugin )
                 configurationKey.setKeyValue( daoUtil.getString( 3 ) );
             }
 
-            daoUtil.free( );
-
             return configurationKey;
         }
     }
@@ -151,7 +147,6 @@ public void delete( int nConfigurationKeyId, Plugin plugin )
         {
             daoUtil.setInt( 1, nConfigurationKeyId );
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -174,7 +169,6 @@ public void store( ConfigurationKey configurationKey, Plugin plugin )
             daoUtil.setInt( 4, configurationKey.getIdKey( ) );
 
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -203,8 +197,6 @@ public Collection<ConfigurationKey> selectConfigurationKeysList( Plugin plugin )
                 configurationKeyList.add( configurationKey );
             }
 
-            daoUtil.free( );
-
             return configurationKeyList;
         }
     }
diff --git a/src/java/fr/paris/lutece/plugins/pluginwizard/business/ModelDAO.java b/src/java/fr/paris/lutece/plugins/pluginwizard/business/ModelDAO.java
index 3993bd1a..9ddab2ac 100644
--- a/src/java/fr/paris/lutece/plugins/pluginwizard/business/ModelDAO.java
+++ b/src/java/fr/paris/lutece/plugins/pluginwizard/business/ModelDAO.java
@@ -69,7 +69,6 @@ public int newPrimaryKey( Plugin plugin )
 
             daoUtil.next( );
             nKey = daoUtil.getInt( 1 ) + 1;
-            daoUtil.free( );
 
             return nKey;
         }
@@ -96,7 +95,6 @@ public void insert( Model model, Plugin plugin )
             daoUtil.setString( 3, model.getModelJson( ) );
 
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -128,8 +126,6 @@ public Model load( int nId, Plugin plugin )
                 model.setModelJson( daoUtil.getString( 3 ) );
             }
 
-            daoUtil.free( );
-
             return model;
         }
     }
@@ -149,7 +145,6 @@ public void delete( int nModelId, Plugin plugin )
         {
             daoUtil.setInt( 1, nModelId );
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -173,7 +168,6 @@ public void store( Model model, Plugin plugin )
             daoUtil.setInt( 4, model.getIdPlugin( ) );
 
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -203,8 +197,6 @@ public List<Model> selectModelsList( Plugin plugin )
                 modelList.add( model );
             }
 
-            daoUtil.free( );
-
             return modelList;
         }
     }
diff --git a/src/java/fr/paris/lutece/plugins/pluginwizard/business/model/PluginModelDAO.java b/src/java/fr/paris/lutece/plugins/pluginwizard/business/model/PluginModelDAO.java
index c8042ab1..8832e5f6 100644
--- a/src/java/fr/paris/lutece/plugins/pluginwizard/business/model/PluginModelDAO.java
+++ b/src/java/fr/paris/lutece/plugins/pluginwizard/business/model/PluginModelDAO.java
@@ -76,7 +76,6 @@ public int newPrimaryKey( Plugin plugin )
             }
 
             nKey = daoUtil.getInt( 1 ) + 1;
-            daoUtil.free( );
 
             return nKey;
         }
@@ -113,7 +112,6 @@ public void insert( PluginModel pluginModel, Plugin plugin )
             daoUtil.setString( 14, pluginModel.getPluginDbPoolRequired( ) );
 
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -157,8 +155,6 @@ public PluginModel load( int nId, Plugin plugin )
                 // //TODO Portlets pluginModel.setPluginPortlets( PluginPortletHome.findByPlugin( nId, plugin ) );
             }
 
-            daoUtil.free( );
-
             return pluginModel;
         }
     }
@@ -177,7 +173,6 @@ public void delete( int nPluginModelId, Plugin plugin )
         {
             daoUtil.setInt( 1, nPluginModelId );
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -211,7 +206,6 @@ public void store( PluginModel pluginModel, Plugin plugin )
             daoUtil.setInt( 15, pluginModel.getIdPlugin( ) );
 
             daoUtil.executeUpdate( );
-            daoUtil.free( );
         }
     }
 
@@ -251,8 +245,6 @@ public Collection<PluginModel> selectPluginModelsList( Plugin plugin )
                 pluginModelList.add( pluginModel );
             }
 
-            daoUtil.free( );
-
             return pluginModelList;
         }
     }
@@ -280,8 +272,6 @@ public int selectPluginModelByName( Plugin plugin, String strPluginName )
                 nPluginId = daoUtil.getInt( 1 );
             }
 
-            daoUtil.free( );
-
             return nPluginId;
         }
     }
@@ -309,8 +299,6 @@ public boolean pluginExists( String strPluginName, Plugin plugin )
                 nCount = daoUtil.getInt( 1 );
             }
 
-            daoUtil.free( );
-
             if ( nCount > 0 )
             {
                 bValue = true;
diff --git a/webapp/WEB-INF/templates/generators/default/business/gt_business_dao.html b/webapp/WEB-INF/templates/generators/default/business/gt_business_dao.html
index 63450357..694c5701 100644
--- a/webapp/WEB-INF/templates/generators/default/business/gt_business_dao.html
+++ b/webapp/WEB-INF/templates/generators/default/business/gt_business_dao.html
@@ -103,8 +103,7 @@
 	            </#if>
 	            </#list>
 	        }
-	
-	        daoUtil.free( );
+
 	        return ${business_class.instanceName};
         }
     }
@@ -119,7 +118,6 @@
         {
 	        daoUtil.setInt( 1 , nKey );
 	        daoUtil.executeUpdate( );
-	        daoUtil.free( );
         }
     }
 
@@ -140,7 +138,6 @@
 	        daoUtil.setInt( nIndex , ${business_class.instanceName}.getId( ) );
 	
 	        daoUtil.executeUpdate( );
-	        daoUtil.free( );
         }
     }
 
@@ -171,8 +168,7 @@
 	
 	            ${business_class.instanceName}List.add( ${business_class.instanceName} );
 	        }
-	
-	        daoUtil.free( );
+
 	        return ${business_class.instanceName}List;
         }
     }
@@ -192,8 +188,7 @@
 	        {
 	            ${business_class.instanceName}List.add( daoUtil.getInt( 1 ) );
 	        }
-	
-	        daoUtil.free( );
+
 	        return ${business_class.instanceName}List;
         }
     }
@@ -213,8 +208,7 @@
 	        {
 	            ${business_class.instanceName}List.addItem( daoUtil.getInt( 1 ) , daoUtil.getString( 2 ) );
 	        }
-	
-	        daoUtil.free( );
+
 	        return ${business_class.instanceName}List;
     	}
     }
diff --git a/webapp/WEB-INF/templates/generators/default/xml/gt_xml_plugin_file.html b/webapp/WEB-INF/templates/generators/default/xml/gt_xml_plugin_file.html
index d1d792ca..f62f30f2 100644
--- a/webapp/WEB-INF/templates/generators/default/xml/gt_xml_plugin_file.html
+++ b/webapp/WEB-INF/templates/generators/default/xml/gt_xml_plugin_file.html
@@ -95,14 +95,42 @@
     </portlets>
     </#if>
 
-    <!-- You can add Daemons here -->
+    <!-- You can add Daemons here
+    <daemons>
+        <daemon>
+            <daemon-id>Add daemon-id here</daemon-id>
+            <daemon-name>Add daemon-name here</daemon-name>
+            <daemon-description>Add daemon-description here</daemon-description>
+            <daemon-class>Add daemon-class here</daemon-class>
+        </daemon>
+      <daemons>
+      -->
 
-    <!-- You can add RBAC Resources here -->
+    <!-- You can add RBAC Resources here
+    <rbac-resource-types>
+        <rbac-resource-type>
+            <rbac-resource-type-class>Add rbac-resource-type-class here</rbac-resource-type-class>
+        </rbac-resource-type>
+    <rbac-resource-types>
+    -->
 
-    <!-- You can add Freemarker files here -->
+    <!-- You can add Freemarker files here
+    <freemarker-macro-files>
+        <freemarker-macro-file>Add freemarker-macro-file here</freemarker-macro-file>
+    </freemarker-macro-files>
+    -->
 
-    <!-- You can add CSS here -->
+    <!-- You can add CSS here
+    <css-stylesheets>
+        <css-stylesheets-scope>Add ss-stylesheets-scope here</css-stylesheets-scope>
+        <css-stylesheet mode="1">Add css-stylesheet path here</css-stylesheet>
+    </css-stylesheets>
+    -->
 
-    <!-- You can add JS here -->
+    <!-- You can add JS here
+    <admin-javascript-files>
+        <admin-javascript-file>Add admin-javascript-file path here  </admin-javascript-file>
+    </admin-javascript-files>
+    -->
 
 </plug-in>
\ No newline at end of file