From 371c8e27cc394dfc8d224bfd87b40628b5b29e9e Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 26 Apr 2022 14:18:08 +0200
Subject: [PATCH] Small config form improvements

---
 MultiTool.Form/DS_DD_ECM.Designer.vb | 158 ++++++++++++++++++++++++++-
 MultiTool.Form/DS_DD_ECM.xsd         |  95 ++++++++++------
 MultiTool.Form/frmConfig.Designer.vb | 111 ++++++++++++++-----
 MultiTool.Form/frmConfig.resx        |   3 +
 4 files changed, 305 insertions(+), 62 deletions(-)

diff --git a/MultiTool.Form/DS_DD_ECM.Designer.vb b/MultiTool.Form/DS_DD_ECM.Designer.vb
index 0d9a882..35327d9 100644
--- a/MultiTool.Form/DS_DD_ECM.Designer.vb
+++ b/MultiTool.Form/DS_DD_ECM.Designer.vb
@@ -503,6 +503,14 @@ Partial Public Class DS_DD_ECM
         
         Private columnCHANGED_WHEN As Global.System.Data.DataColumn
         
+        Private columnACTIVE As Global.System.Data.DataColumn
+        
+        Private columnCOMMENT As Global.System.Data.DataColumn
+        
+        Private columnTEMPLATE_NAME As Global.System.Data.DataColumn
+        
+        Private columnTABLE_NAME As Global.System.Data.DataColumn
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Sub New()
@@ -658,6 +666,38 @@ Partial Public Class DS_DD_ECM
             End Get
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnACTIVE
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnCOMMENT
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public ReadOnly Property TEMPLATE_NAMEColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnTEMPLATE_NAME
+            End Get
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public ReadOnly Property TABLE_NAMEColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnTABLE_NAME
+            End Get
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Browsable(false)>  _
@@ -695,9 +735,27 @@ Partial Public Class DS_DD_ECM
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Overloads Function AddTBMT_TEMPLATE_ITEMSRow(ByVal XML_NAME As String, ByVal XML_TYPE_ID As Integer, ByVal IS_READ_ONLY As Boolean, ByVal IS_VISIBLE As Boolean, ByVal ORDER_KEY As Integer, ByVal FUNCTION_ID As Integer, ByVal IS_REQUIRED As Boolean, ByVal XML_TABLE_ID As Integer, ByVal IS_VIRTUAL As Boolean, ByVal FUNCTION_PARAMETERS As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBMT_TEMPLATE_ITEMSRow
+        Public Overloads Function AddTBMT_TEMPLATE_ITEMSRow( _
+                    ByVal XML_NAME As String,  _
+                    ByVal XML_TYPE_ID As Integer,  _
+                    ByVal IS_READ_ONLY As Boolean,  _
+                    ByVal IS_VISIBLE As Boolean,  _
+                    ByVal ORDER_KEY As Integer,  _
+                    ByVal FUNCTION_ID As Integer,  _
+                    ByVal IS_REQUIRED As Boolean,  _
+                    ByVal XML_TABLE_ID As Integer,  _
+                    ByVal IS_VIRTUAL As Boolean,  _
+                    ByVal FUNCTION_PARAMETERS As String,  _
+                    ByVal ADDED_WHO As String,  _
+                    ByVal ADDED_WHEN As Date,  _
+                    ByVal CHANGED_WHO As String,  _
+                    ByVal CHANGED_WHEN As Date,  _
+                    ByVal ACTIVE As Boolean,  _
+                    ByVal COMMENT As String,  _
+                    ByVal TEMPLATE_NAME As String,  _
+                    ByVal TABLE_NAME As String) As TBMT_TEMPLATE_ITEMSRow
             Dim rowTBMT_TEMPLATE_ITEMSRow As TBMT_TEMPLATE_ITEMSRow = CType(Me.NewRow,TBMT_TEMPLATE_ITEMSRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, XML_TABLE_ID, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN}
+            Dim columnValuesArray() As Object = New Object() {Nothing, XML_NAME, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, ORDER_KEY, FUNCTION_ID, IS_REQUIRED, XML_TABLE_ID, IS_VIRTUAL, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, ACTIVE, COMMENT, TEMPLATE_NAME, TABLE_NAME}
             rowTBMT_TEMPLATE_ITEMSRow.ItemArray = columnValuesArray
             Me.Rows.Add(rowTBMT_TEMPLATE_ITEMSRow)
             Return rowTBMT_TEMPLATE_ITEMSRow
@@ -741,6 +799,10 @@ Partial Public Class DS_DD_ECM
             Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN")
             Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO")
             Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN")
+            Me.columnACTIVE = MyBase.Columns("ACTIVE")
+            Me.columnCOMMENT = MyBase.Columns("COMMENT")
+            Me.columnTEMPLATE_NAME = MyBase.Columns("TEMPLATE_NAME")
+            Me.columnTABLE_NAME = MyBase.Columns("TABLE_NAME")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -776,6 +838,14 @@ Partial Public Class DS_DD_ECM
             MyBase.Columns.Add(Me.columnCHANGED_WHO)
             Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element)
             MyBase.Columns.Add(Me.columnCHANGED_WHEN)
+            Me.columnACTIVE = New Global.System.Data.DataColumn("ACTIVE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnACTIVE)
+            Me.columnCOMMENT = New Global.System.Data.DataColumn("COMMENT", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnCOMMENT)
+            Me.columnTEMPLATE_NAME = New Global.System.Data.DataColumn("TEMPLATE_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnTEMPLATE_NAME)
+            Me.columnTABLE_NAME = New Global.System.Data.DataColumn("TABLE_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnTABLE_NAME)
             Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
             Me.columnGUID.AutoIncrement = true
             Me.columnGUID.AutoIncrementSeed = -1
@@ -796,6 +866,12 @@ Partial Public Class DS_DD_ECM
             Me.columnADDED_WHO.AllowDBNull = false
             Me.columnADDED_WHO.MaxLength = 50
             Me.columnCHANGED_WHO.MaxLength = 50
+            Me.columnACTIVE.AllowDBNull = false
+            Me.columnCOMMENT.MaxLength = 100
+            Me.columnTEMPLATE_NAME.AllowDBNull = false
+            Me.columnTEMPLATE_NAME.MaxLength = 20
+            Me.columnTABLE_NAME.AllowDBNull = false
+            Me.columnTABLE_NAME.MaxLength = 2147483647
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -2709,6 +2785,54 @@ Partial Public Class DS_DD_ECM
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Property ACTIVE() As Boolean
+            Get
+                Return CType(Me(Me.tableTBMT_TEMPLATE_ITEMS.ACTIVEColumn),Boolean)
+            End Get
+            Set
+                Me(Me.tableTBMT_TEMPLATE_ITEMS.ACTIVEColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Property COMMENT() As String
+            Get
+                Try 
+                    Return CType(Me(Me.tableTBMT_TEMPLATE_ITEMS.COMMENTColumn),String)
+                Catch e As Global.System.InvalidCastException
+                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBMT_TEMPLATE_ITEMS ist DBNull.", e)
+                End Try
+            End Get
+            Set
+                Me(Me.tableTBMT_TEMPLATE_ITEMS.COMMENTColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Property TEMPLATE_NAME() As String
+            Get
+                Return CType(Me(Me.tableTBMT_TEMPLATE_ITEMS.TEMPLATE_NAMEColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBMT_TEMPLATE_ITEMS.TEMPLATE_NAMEColumn) = value
+            End Set
+        End Property
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Property TABLE_NAME() As String
+            Get
+                Return CType(Me(Me.tableTBMT_TEMPLATE_ITEMS.TABLE_NAMEColumn),String)
+            End Get
+            Set
+                Me(Me.tableTBMT_TEMPLATE_ITEMS.TABLE_NAMEColumn) = value
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Function IsFUNCTION_IDNull() As Boolean
@@ -2769,6 +2893,18 @@ Partial Public Class DS_DD_ECM
             Me(Me.tableTBMT_TEMPLATE_ITEMS.CHANGED_WHENColumn) = Global.System.Convert.DBNull
         End Sub
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Function IsCOMMENTNull() As Boolean
+            Return Me.IsNull(Me.tableTBMT_TEMPLATE_ITEMS.COMMENTColumn)
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Sub SetCOMMENTNull()
+            Me(Me.tableTBMT_TEMPLATE_ITEMS.COMMENTColumn) = Global.System.Convert.DBNull
+        End Sub
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Function GetTBMT_FUNCTIONSRows() As TBMT_FUNCTIONSRow()
@@ -3639,6 +3775,10 @@ Namespace DS_DD_ECMTableAdapters
             tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN")
             tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO")
             tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN")
+            tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE")
+            tableMapping.ColumnMappings.Add("COMMENT", "COMMENT")
+            tableMapping.ColumnMappings.Add("TEMPLATE_NAME", "TEMPLATE_NAME")
+            tableMapping.ColumnMappings.Add("TABLE_NAME", "TABLE_NAME")
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -3715,7 +3855,19 @@ Namespace DS_DD_ECMTableAdapters
             Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        TBMT_TEMPLATE_ITEMS.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBMT_TEMPLATE_ITEMS"
+            Me._commandCollection(0).CommandText = "SELECT        TBMT_TEMPLATE_ITEMS.GUID, TBMT_TEMPLATE_ITEMS.ORDER_KEY, TBMT_TEMPL"& _ 
+                "ATE_ITEMS.XML_NAME, TBMT_TEMPLATE_ITEMS.XML_TABLE_ID, TBMT_TEMPLATE_ITEMS.XML_TY"& _ 
+                "PE_ID, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBMT_TEMPLATE_ITEMS.IS_READ_ONLY, TBMT_TEMPLAT"& _ 
+                "E_ITEMS.IS_VISIBLE, TBMT_TEMPLATE_ITEMS.IS_REQUIRED, TBMT_TEMPLATE_ITEMS.IS_VIRT"& _ 
+                "UAL, TBMT_TEMPLATE_ITEMS.FUNCTION_ID, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBMT_TEMPLATE_I"& _ 
+                "TEMS.FUNCTION_PARAMETERS, TBMT_TEMPLATE_ITEMS.ACTIVE, TBMT_TEMPLATE_ITEMS.COMMEN"& _ 
+                "T, TBMT_TEMPLATE_ITEMS.ADDED_WHO, TBMT_TEMPLATE_ITEMS.ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"            "& _ 
+                "             TBMT_TEMPLATE_ITEMS.CHANGED_WHO, TBMT_TEMPLATE_ITEMS.CHANGED_WHEN, "& _ 
+                "TBTEMPLATES.NAME AS TEMPLATE_NAME, TBTABLES.NAME AS TABLE_NAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            "& _ 
+                "TBMT_TEMPLATE_ITEMS INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBMT_TABLES AS TBTABLES"& _ 
+                " ON TBMT_TEMPLATE_ITEMS.XML_TABLE_ID = TBTABLES.GUID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"               "& _ 
+                "          TBMT_TEMPLATES AS TBTEMPLATES ON TBTABLES.TEMPLATE_ID = TBTEMPLATES.GU"& _ 
+                "ID"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
         End Sub
         
diff --git a/MultiTool.Form/DS_DD_ECM.xsd b/MultiTool.Form/DS_DD_ECM.xsd
index cd32320..f0bc00c 100644
--- a/MultiTool.Form/DS_DD_ECM.xsd
+++ b/MultiTool.Form/DS_DD_ECM.xsd
@@ -9,13 +9,13 @@
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMT_TEMPLATE_ITEMSTableAdapter" GeneratorDataComponentClassName="TBMT_TEMPLATE_ITEMSTableAdapter" Name="TBMT_TEMPLATE_ITEMS" UserDataComponentName="TBMT_TEMPLATE_ITEMSTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM TBMT_TEMPLATE_ITEMS
 WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
@@ -42,14 +42,19 @@ SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VI
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        TBMT_TEMPLATE_ITEMS.*
-FROM            TBMT_TEMPLATE_ITEMS</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                    <CommandText>SELECT        TBMT_TEMPLATE_ITEMS.GUID, TBMT_TEMPLATE_ITEMS.ORDER_KEY, TBMT_TEMPLATE_ITEMS.XML_NAME, TBMT_TEMPLATE_ITEMS.XML_TABLE_ID, TBMT_TEMPLATE_ITEMS.XML_TYPE_ID, 
+                         TBMT_TEMPLATE_ITEMS.IS_READ_ONLY, TBMT_TEMPLATE_ITEMS.IS_VISIBLE, TBMT_TEMPLATE_ITEMS.IS_REQUIRED, TBMT_TEMPLATE_ITEMS.IS_VIRTUAL, TBMT_TEMPLATE_ITEMS.FUNCTION_ID, 
+                         TBMT_TEMPLATE_ITEMS.FUNCTION_PARAMETERS, TBMT_TEMPLATE_ITEMS.ACTIVE, TBMT_TEMPLATE_ITEMS.COMMENT, TBMT_TEMPLATE_ITEMS.ADDED_WHO, TBMT_TEMPLATE_ITEMS.ADDED_WHEN, 
+                         TBMT_TEMPLATE_ITEMS.CHANGED_WHO, TBMT_TEMPLATE_ITEMS.CHANGED_WHEN, TBTEMPLATES.NAME AS TEMPLATE_NAME, TBTABLES.NAME AS TABLE_NAME
+FROM            TBMT_TEMPLATE_ITEMS INNER JOIN
+                         TBMT_TABLES AS TBTABLES ON TBMT_TEMPLATE_ITEMS.XML_TABLE_ID = TBTABLES.GUID INNER JOIN
+                         TBMT_TEMPLATES AS TBTEMPLATES ON TBTABLES.TEMPLATE_ID = TBTEMPLATES.GUID</CommandText>
                     <Parameters />
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>UPDATE       TBMT_TEMPLATE_ITEMS
 SET                ORDER_KEY = @ORDER_KEY, XML_NAME = @XML_NAME, XML_TABLE_ID = @XML_TABLE_ID, XML_TYPE_ID = @XML_TYPE_ID, IS_READ_ONLY = @IS_READ_ONLY, IS_VISIBLE = @IS_VISIBLE, 
                          IS_REQUIRED = @IS_REQUIRED, IS_VIRTUAL = @IS_VIRTUAL, FUNCTION_ID = @FUNCTION_ID, FUNCTION_PARAMETERS = @FUNCTION_PARAMETERS, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, 
@@ -57,22 +62,22 @@ SET                ORDER_KEY = @ORDER_KEY, XML_NAME = @XML_NAME, XML_TABLE_ID =
 WHERE        (GUID = @Original_GUID); 
 SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VISIBLE, IS_REQUIRED, IS_VIRTUAL, FUNCTION_ID, FUNCTION_PARAMETERS, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBMT_TEMPLATE_ITEMS WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="ORDER_KEY" ColumnName="ORDER_KEY" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ORDER_KEY" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ORDER_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="XML_NAME" ColumnName="XML_NAME" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@XML_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="XML_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TABLE_ID" ColumnName="XML_TABLE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="XML_TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TYPE_ID" ColumnName="XML_TYPE_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="XML_TYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_READ_ONLY" ColumnName="IS_READ_ONLY" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VISIBLE" ColumnName="IS_VISIBLE" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_REQUIRED" ColumnName="IS_REQUIRED" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_REQUIRED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_REQUIRED" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VIRTUAL" ColumnName="IS_VIRTUAL" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VIRTUAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VIRTUAL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION_ID" ColumnName="FUNCTION_ID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FUNCTION_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FUNCTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION_PARAMETERS" ColumnName="FUNCTION_PARAMETERS" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@FUNCTION_PARAMETERS" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="FUNCTION_PARAMETERS" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBMT_TEMPLATE_ITEMS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ORDER_KEY" ColumnName="ORDER_KEY" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@ORDER_KEY" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="ORDER_KEY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="XML_NAME" ColumnName="XML_NAME" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@XML_NAME" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="XML_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TABLE_ID" ColumnName="XML_TABLE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TABLE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="XML_TABLE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="XML_TYPE_ID" ColumnName="XML_TYPE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@XML_TYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="XML_TYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_READ_ONLY" ColumnName="IS_READ_ONLY" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VISIBLE" ColumnName="IS_VISIBLE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VISIBLE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VISIBLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_REQUIRED" ColumnName="IS_REQUIRED" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_REQUIRED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_REQUIRED" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IS_VIRTUAL" ColumnName="IS_VIRTUAL" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@IS_VIRTUAL" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="IS_VIRTUAL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION_ID" ColumnName="FUNCTION_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@FUNCTION_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="FUNCTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION_PARAMETERS" ColumnName="FUNCTION_PARAMETERS" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@FUNCTION_PARAMETERS" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="FUNCTION_PARAMETERS" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="nvarchar(50)" DbType="String" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -94,6 +99,10 @@ SELECT GUID, ORDER_KEY, XML_NAME, XML_TABLE_ID, XML_TYPE_ID, IS_READ_ONLY, IS_VI
               <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
               <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
               <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+              <Mapping SourceColumn="ACTIVE" DataSetColumn="ACTIVE" />
+              <Mapping SourceColumn="COMMENT" DataSetColumn="COMMENT" />
+              <Mapping SourceColumn="TEMPLATE_NAME" DataSetColumn="TEMPLATE_NAME" />
+              <Mapping SourceColumn="TABLE_NAME" DataSetColumn="TABLE_NAME" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -393,7 +402,7 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
   <xs:element name="DS_DD_ECM" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_DD_ECM" msprop:Generator_UserDSName="DS_DD_ECM">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBMT_TEMPLATE_ITEMS" msprop:Generator_TableClassName="TBMT_TEMPLATE_ITEMSDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATE_ITEMS" msprop:Generator_TablePropName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowDeletingName="TBMT_TEMPLATE_ITEMSRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATE_ITEMSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATE_ITEMSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATE_ITEMSRowDeleted" msprop:Generator_UserTableName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowChangedName="TBMT_TEMPLATE_ITEMSRowChanged" msprop:Generator_RowEvArgName="TBMT_TEMPLATE_ITEMSRowChangeEvent" msprop:Generator_RowClassName="TBMT_TEMPLATE_ITEMSRow">
+        <xs:element name="TBMT_TEMPLATE_ITEMS" msprop:Generator_TableClassName="TBMT_TEMPLATE_ITEMSDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATE_ITEMS" msprop:Generator_RowChangedName="TBMT_TEMPLATE_ITEMSRowChanged" msprop:Generator_TablePropName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowDeletingName="TBMT_TEMPLATE_ITEMSRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATE_ITEMSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATE_ITEMSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATE_ITEMSRowDeleted" msprop:Generator_RowClassName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_UserTableName="TBMT_TEMPLATE_ITEMS" msprop:Generator_RowEvArgName="TBMT_TEMPLATE_ITEMSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -435,10 +444,32 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
                 </xs:simpleType>
               </xs:element>
               <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" />
+              <xs:element name="COMMENT" msprop:Generator_ColumnVarNameInTable="columnCOMMENT" msprop:Generator_ColumnPropNameInRow="COMMENT" msprop:Generator_ColumnPropNameInTable="COMMENTColumn" msprop:Generator_UserColumnName="COMMENT" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="TEMPLATE_NAME" msprop:Generator_ColumnVarNameInTable="columnTEMPLATE_NAME" msprop:Generator_ColumnPropNameInRow="TEMPLATE_NAME" msprop:Generator_ColumnPropNameInTable="TEMPLATE_NAMEColumn" msprop:Generator_UserColumnName="TEMPLATE_NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="20" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="TABLE_NAME" msprop:Generator_ColumnVarNameInTable="columnTABLE_NAME" msprop:Generator_ColumnPropNameInRow="TABLE_NAME" msprop:Generator_ColumnPropNameInTable="TABLE_NAMEColumn" msprop:Generator_UserColumnName="TABLE_NAME">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="2147483647" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEDI_XML_TYPES" msprop:Generator_TableClassName="TBEDI_XML_TYPESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TYPES" msprop:Generator_TablePropName="TBEDI_XML_TYPES" msprop:Generator_RowDeletingName="TBEDI_XML_TYPESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TYPESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TYPESRowDeleted" msprop:Generator_UserTableName="TBEDI_XML_TYPES" msprop:Generator_RowChangedName="TBEDI_XML_TYPESRowChanged" msprop:Generator_RowEvArgName="TBEDI_XML_TYPESRowChangeEvent" msprop:Generator_RowClassName="TBEDI_XML_TYPESRow">
+        <xs:element name="TBEDI_XML_TYPES" msprop:Generator_TableClassName="TBEDI_XML_TYPESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_TYPES" msprop:Generator_RowChangedName="TBEDI_XML_TYPESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_TYPES" msprop:Generator_RowDeletingName="TBEDI_XML_TYPESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_TYPESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_TYPESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_TYPESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_TYPESRow" msprop:Generator_UserTableName="TBEDI_XML_TYPES" msprop:Generator_RowEvArgName="TBEDI_XML_TYPESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -452,7 +483,7 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMT_TEMPLATES" msprop:Generator_TableClassName="TBMT_TEMPLATESDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATES" msprop:Generator_TablePropName="TBMT_TEMPLATES" msprop:Generator_RowDeletingName="TBMT_TEMPLATESRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATESRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATESRowDeleted" msprop:Generator_UserTableName="TBMT_TEMPLATES" msprop:Generator_RowChangedName="TBMT_TEMPLATESRowChanged" msprop:Generator_RowEvArgName="TBMT_TEMPLATESRowChangeEvent" msprop:Generator_RowClassName="TBMT_TEMPLATESRow">
+        <xs:element name="TBMT_TEMPLATES" msprop:Generator_TableClassName="TBMT_TEMPLATESDataTable" msprop:Generator_TableVarName="tableTBMT_TEMPLATES" msprop:Generator_RowChangedName="TBMT_TEMPLATESRowChanged" msprop:Generator_TablePropName="TBMT_TEMPLATES" msprop:Generator_RowDeletingName="TBMT_TEMPLATESRowDeleting" msprop:Generator_RowChangingName="TBMT_TEMPLATESRowChanging" msprop:Generator_RowEvHandlerName="TBMT_TEMPLATESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_TEMPLATESRowDeleted" msprop:Generator_RowClassName="TBMT_TEMPLATESRow" msprop:Generator_UserTableName="TBMT_TEMPLATES" msprop:Generator_RowEvArgName="TBMT_TEMPLATESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -473,7 +504,7 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBEDI_XML_NODES" msprop:Generator_TableClassName="TBEDI_XML_NODESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_NODES" msprop:Generator_TablePropName="TBEDI_XML_NODES" msprop:Generator_RowDeletingName="TBEDI_XML_NODESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_NODESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_NODESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_NODESRowDeleted" msprop:Generator_UserTableName="TBEDI_XML_NODES" msprop:Generator_RowChangedName="TBEDI_XML_NODESRowChanged" msprop:Generator_RowEvArgName="TBEDI_XML_NODESRowChangeEvent" msprop:Generator_RowClassName="TBEDI_XML_NODESRow">
+        <xs:element name="TBEDI_XML_NODES" msprop:Generator_TableClassName="TBEDI_XML_NODESDataTable" msprop:Generator_TableVarName="tableTBEDI_XML_NODES" msprop:Generator_RowChangedName="TBEDI_XML_NODESRowChanged" msprop:Generator_TablePropName="TBEDI_XML_NODES" msprop:Generator_RowDeletingName="TBEDI_XML_NODESRowDeleting" msprop:Generator_RowChangingName="TBEDI_XML_NODESRowChanging" msprop:Generator_RowEvHandlerName="TBEDI_XML_NODESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBEDI_XML_NODESRowDeleted" msprop:Generator_RowClassName="TBEDI_XML_NODESRow" msprop:Generator_UserTableName="TBEDI_XML_NODES" msprop:Generator_RowEvArgName="TBEDI_XML_NODESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -489,7 +520,7 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMT_FUNCTIONS" msprop:Generator_TableClassName="TBMT_FUNCTIONSDataTable" msprop:Generator_TableVarName="tableTBMT_FUNCTIONS" msprop:Generator_TablePropName="TBMT_FUNCTIONS" msprop:Generator_RowDeletingName="TBMT_FUNCTIONSRowDeleting" msprop:Generator_RowChangingName="TBMT_FUNCTIONSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_FUNCTIONSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_FUNCTIONSRowDeleted" msprop:Generator_UserTableName="TBMT_FUNCTIONS" msprop:Generator_RowChangedName="TBMT_FUNCTIONSRowChanged" msprop:Generator_RowEvArgName="TBMT_FUNCTIONSRowChangeEvent" msprop:Generator_RowClassName="TBMT_FUNCTIONSRow">
+        <xs:element name="TBMT_FUNCTIONS" msprop:Generator_TableClassName="TBMT_FUNCTIONSDataTable" msprop:Generator_TableVarName="tableTBMT_FUNCTIONS" msprop:Generator_RowChangedName="TBMT_FUNCTIONSRowChanged" msprop:Generator_TablePropName="TBMT_FUNCTIONS" msprop:Generator_RowDeletingName="TBMT_FUNCTIONSRowDeleting" msprop:Generator_RowChangingName="TBMT_FUNCTIONSRowChanging" msprop:Generator_RowEvHandlerName="TBMT_FUNCTIONSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_FUNCTIONSRowDeleted" msprop:Generator_RowClassName="TBMT_FUNCTIONSRow" msprop:Generator_UserTableName="TBMT_FUNCTIONS" msprop:Generator_RowEvArgName="TBMT_FUNCTIONSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -517,7 +548,7 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMT_CONFIG" msprop:Generator_TableClassName="TBMT_CONFIGDataTable" msprop:Generator_TableVarName="tableTBMT_CONFIG" msprop:Generator_TablePropName="TBMT_CONFIG" msprop:Generator_RowDeletingName="TBMT_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBMT_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBMT_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_CONFIGRowDeleted" msprop:Generator_UserTableName="TBMT_CONFIG" msprop:Generator_RowChangedName="TBMT_CONFIGRowChanged" msprop:Generator_RowEvArgName="TBMT_CONFIGRowChangeEvent" msprop:Generator_RowClassName="TBMT_CONFIGRow">
+        <xs:element name="TBMT_CONFIG" msprop:Generator_TableClassName="TBMT_CONFIGDataTable" msprop:Generator_TableVarName="tableTBMT_CONFIG" msprop:Generator_RowChangedName="TBMT_CONFIGRowChanged" msprop:Generator_TablePropName="TBMT_CONFIG" msprop:Generator_RowDeletingName="TBMT_CONFIGRowDeleting" msprop:Generator_RowChangingName="TBMT_CONFIGRowChanging" msprop:Generator_RowEvHandlerName="TBMT_CONFIGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMT_CONFIGRowDeleted" msprop:Generator_RowClassName="TBMT_CONFIGRow" msprop:Generator_UserTableName="TBMT_CONFIG" msprop:Generator_RowEvArgName="TBMT_CONFIGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -592,9 +623,9 @@ WHERE        (TEMPLATE_ID IS NULL)</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBMT_FUNCTIONS" msdata:parentkey="FUNCTION_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_FUNCTIONS" msprop:Generator_ChildPropName="GetTBMT_FUNCTIONSRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" />
-      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TYPES" msdata:parentkey="XML_TYPE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_TYPES" msprop:Generator_ChildPropName="GetTBEDI_XML_TYPESRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" />
-      <msdata:Relationship name="TBEDI_XML_NODES_TBMT_TEMPLATES" msdata:parent="TBEDI_XML_NODES" msdata:child="TBMT_TEMPLATES" msdata:parentkey="TEMPLATE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_TEMPLATES" msprop:Generator_ChildPropName="GetTBMT_TEMPLATESRows" msprop:Generator_UserRelationName="TBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_RelationVarName="relationTBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_UserParentTable="TBEDI_XML_NODES" msprop:Generator_ParentPropName="TBEDI_XML_NODESRow" />
+      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBMT_FUNCTIONS" msdata:parentkey="FUNCTION_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_FUNCTIONS" msprop:Generator_ChildPropName="GetTBMT_FUNCTIONSRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBMT_FUNCTIONS" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" />
+      <msdata:Relationship name="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msdata:parent="TBMT_TEMPLATE_ITEMS" msdata:child="TBEDI_XML_TYPES" msdata:parentkey="XML_TYPE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBEDI_XML_TYPES" msprop:Generator_ChildPropName="GetTBEDI_XML_TYPESRows" msprop:Generator_UserRelationName="TBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_RelationVarName="relationTBMT_TEMPLATE_ITEMS_TBEDI_XML_TYPES" msprop:Generator_UserParentTable="TBMT_TEMPLATE_ITEMS" msprop:Generator_ParentPropName="TBMT_TEMPLATE_ITEMSRow" />
+      <msdata:Relationship name="TBEDI_XML_NODES_TBMT_TEMPLATES" msdata:parent="TBEDI_XML_NODES" msdata:child="TBMT_TEMPLATES" msdata:parentkey="TEMPLATE_ID" msdata:childkey="GUID" msprop:Generator_UserChildTable="TBMT_TEMPLATES" msprop:Generator_ChildPropName="GetTBMT_TEMPLATESRows" msprop:Generator_UserRelationName="TBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_ParentPropName="TBEDI_XML_NODESRow" msprop:Generator_RelationVarName="relationTBEDI_XML_NODES_TBMT_TEMPLATES" msprop:Generator_UserParentTable="TBEDI_XML_NODES" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/MultiTool.Form/frmConfig.Designer.vb b/MultiTool.Form/frmConfig.Designer.vb
index adb4e10..47a16c8 100644
--- a/MultiTool.Form/frmConfig.Designer.vb
+++ b/MultiTool.Form/frmConfig.Designer.vb
@@ -37,15 +37,20 @@ Partial Class frmConfig
         Me.colIS_READ_ONLY = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colIS_VISIBLE = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colORDER_KEY = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.RepositoryItemSpinEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemSpinEdit()
         Me.colIS_REQUIRED = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colIS_VIRTUAL = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colFUNCTION_ID = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colFUNCTION_PARAMETERS = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.RepositoryItemMemoExEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemMemoExEdit()
         Me.colXML_TABLE_ID = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colADDED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colADDED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colCHANGED_WHO1 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colCHANGED_WHEN1 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colTABLE_NAME = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colTEMPLATE_NAME = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.RepositoryItemMemoEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit()
         Me.tabPageConfig = New DevExpress.XtraTab.XtraTabPage()
         Me.GridConfig = New DevExpress.XtraGrid.GridControl()
         Me.TBMT_CONFIGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -76,9 +81,9 @@ Partial Class frmConfig
         Me.txtWebserviceImportBasePath = New DevExpress.XtraEditors.MemoEdit()
         Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
-        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup()
@@ -96,6 +101,9 @@ Partial Class frmConfig
         CType(Me.TBEDIXMLITEMSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DS_DD_ECM, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewSchema, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemMemoExEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemMemoEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.tabPageConfig.SuspendLayout()
         CType(Me.GridConfig, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBMT_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -111,9 +119,9 @@ Partial Class frmConfig
         CType(Me.txtWebserviceImportBasePath.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -146,6 +154,7 @@ Partial Class frmConfig
         Me.GridSchema.Location = New System.Drawing.Point(0, 0)
         Me.GridSchema.MainView = Me.GridViewSchema
         Me.GridSchema.Name = "GridSchema"
+        Me.GridSchema.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemMemoEdit1, Me.RepositoryItemSpinEdit1, Me.RepositoryItemMemoExEdit1})
         Me.GridSchema.Size = New System.Drawing.Size(1130, 582)
         Me.GridSchema.TabIndex = 0
         Me.GridSchema.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSchema})
@@ -162,9 +171,11 @@ Partial Class frmConfig
         '
         'GridViewSchema
         '
-        Me.GridViewSchema.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colIS_REQUIRED, Me.colIS_VIRTUAL, Me.colFUNCTION_ID, Me.colFUNCTION_PARAMETERS, Me.colXML_TABLE_ID, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1})
+        Me.GridViewSchema.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colXML_NAME, Me.colXML_TYPE_ID, Me.colIS_READ_ONLY, Me.colIS_VISIBLE, Me.colORDER_KEY, Me.colIS_REQUIRED, Me.colIS_VIRTUAL, Me.colFUNCTION_ID, Me.colFUNCTION_PARAMETERS, Me.colXML_TABLE_ID, Me.colADDED_WHO1, Me.colADDED_WHEN1, Me.colCHANGED_WHO1, Me.colCHANGED_WHEN1, Me.colTABLE_NAME, Me.colTEMPLATE_NAME})
         Me.GridViewSchema.GridControl = Me.GridSchema
+        Me.GridViewSchema.GroupCount = 2
         Me.GridViewSchema.Name = "GridViewSchema"
+        Me.GridViewSchema.SortInfo.AddRange(New DevExpress.XtraGrid.Columns.GridColumnSortInfo() {New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colTEMPLATE_NAME, DevExpress.Data.ColumnSortOrder.Ascending), New DevExpress.XtraGrid.Columns.GridColumnSortInfo(Me.colTABLE_NAME, DevExpress.Data.ColumnSortOrder.Ascending)})
         '
         'colGUID
         '
@@ -180,7 +191,7 @@ Partial Class frmConfig
         Me.colXML_NAME.Name = "colXML_NAME"
         Me.colXML_NAME.Visible = True
         Me.colXML_NAME.VisibleIndex = 0
-        Me.colXML_NAME.Width = 123
+        Me.colXML_NAME.Width = 144
         '
         'colXML_TYPE_ID
         '
@@ -190,7 +201,7 @@ Partial Class frmConfig
         Me.colXML_TYPE_ID.Name = "colXML_TYPE_ID"
         Me.colXML_TYPE_ID.Visible = True
         Me.colXML_TYPE_ID.VisibleIndex = 1
-        Me.colXML_TYPE_ID.Width = 30
+        Me.colXML_TYPE_ID.Width = 55
         '
         'colIS_READ_ONLY
         '
@@ -200,7 +211,7 @@ Partial Class frmConfig
         Me.colIS_READ_ONLY.Name = "colIS_READ_ONLY"
         Me.colIS_READ_ONLY.Visible = True
         Me.colIS_READ_ONLY.VisibleIndex = 2
-        Me.colIS_READ_ONLY.Width = 50
+        Me.colIS_READ_ONLY.Width = 80
         '
         'colIS_VISIBLE
         '
@@ -210,16 +221,24 @@ Partial Class frmConfig
         Me.colIS_VISIBLE.Name = "colIS_VISIBLE"
         Me.colIS_VISIBLE.Visible = True
         Me.colIS_VISIBLE.VisibleIndex = 3
+        Me.colIS_VISIBLE.Width = 80
         '
         'colORDER_KEY
         '
         Me.colORDER_KEY.Caption = "Sortierung"
+        Me.colORDER_KEY.ColumnEdit = Me.RepositoryItemSpinEdit1
         Me.colORDER_KEY.FieldName = "ORDER_KEY"
         Me.colORDER_KEY.MaxWidth = 80
         Me.colORDER_KEY.Name = "colORDER_KEY"
         Me.colORDER_KEY.Visible = True
         Me.colORDER_KEY.VisibleIndex = 6
-        Me.colORDER_KEY.Width = 50
+        Me.colORDER_KEY.Width = 80
+        '
+        'RepositoryItemSpinEdit1
+        '
+        Me.RepositoryItemSpinEdit1.AutoHeight = False
+        Me.RepositoryItemSpinEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.RepositoryItemSpinEdit1.Name = "RepositoryItemSpinEdit1"
         '
         'colIS_REQUIRED
         '
@@ -229,7 +248,7 @@ Partial Class frmConfig
         Me.colIS_REQUIRED.Name = "colIS_REQUIRED"
         Me.colIS_REQUIRED.Visible = True
         Me.colIS_REQUIRED.VisibleIndex = 4
-        Me.colIS_REQUIRED.Width = 50
+        Me.colIS_REQUIRED.Width = 80
         '
         'colIS_VIRTUAL
         '
@@ -239,6 +258,7 @@ Partial Class frmConfig
         Me.colIS_VIRTUAL.Name = "colIS_VIRTUAL"
         Me.colIS_VIRTUAL.Visible = True
         Me.colIS_VIRTUAL.VisibleIndex = 5
+        Me.colIS_VIRTUAL.Width = 80
         '
         'colFUNCTION_ID
         '
@@ -248,15 +268,23 @@ Partial Class frmConfig
         Me.colFUNCTION_ID.Name = "colFUNCTION_ID"
         Me.colFUNCTION_ID.Visible = True
         Me.colFUNCTION_ID.VisibleIndex = 7
-        Me.colFUNCTION_ID.Width = 50
+        Me.colFUNCTION_ID.Width = 80
         '
         'colFUNCTION_PARAMETERS
         '
         Me.colFUNCTION_PARAMETERS.Caption = "Funktionsparameter"
+        Me.colFUNCTION_PARAMETERS.ColumnEdit = Me.RepositoryItemMemoExEdit1
         Me.colFUNCTION_PARAMETERS.FieldName = "FUNCTION_PARAMETERS"
         Me.colFUNCTION_PARAMETERS.Name = "colFUNCTION_PARAMETERS"
         Me.colFUNCTION_PARAMETERS.Visible = True
         Me.colFUNCTION_PARAMETERS.VisibleIndex = 8
+        Me.colFUNCTION_PARAMETERS.Width = 401
+        '
+        'RepositoryItemMemoExEdit1
+        '
+        Me.RepositoryItemMemoExEdit1.AutoHeight = False
+        Me.RepositoryItemMemoExEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.RepositoryItemMemoExEdit1.Name = "RepositoryItemMemoExEdit1"
         '
         'colXML_TABLE_ID
         '
@@ -283,6 +311,27 @@ Partial Class frmConfig
         Me.colCHANGED_WHEN1.FieldName = "CHANGED_WHEN"
         Me.colCHANGED_WHEN1.Name = "colCHANGED_WHEN1"
         '
+        'colTABLE_NAME
+        '
+        Me.colTABLE_NAME.Caption = "Tabelle"
+        Me.colTABLE_NAME.FieldName = "TABLE_NAME"
+        Me.colTABLE_NAME.Name = "colTABLE_NAME"
+        Me.colTABLE_NAME.Visible = True
+        Me.colTABLE_NAME.VisibleIndex = 9
+        '
+        'colTEMPLATE_NAME
+        '
+        Me.colTEMPLATE_NAME.Caption = "Vorlage"
+        Me.colTEMPLATE_NAME.FieldName = "TEMPLATE_NAME"
+        Me.colTEMPLATE_NAME.Name = "colTEMPLATE_NAME"
+        Me.colTEMPLATE_NAME.Visible = True
+        Me.colTEMPLATE_NAME.VisibleIndex = 9
+        '
+        'RepositoryItemMemoEdit1
+        '
+        Me.RepositoryItemMemoEdit1.LinesCount = 5
+        Me.RepositoryItemMemoEdit1.Name = "RepositoryItemMemoEdit1"
+        '
         'tabPageConfig
         '
         Me.tabPageConfig.Controls.Add(Me.GridConfig)
@@ -532,14 +581,14 @@ Partial Class frmConfig
         Me.LayoutControlGroup1.Size = New System.Drawing.Size(399, 117)
         Me.LayoutControlGroup1.Text = "Webservice / EWL"
         '
-        'LayoutControlItem4
+        'LayoutControlItem2
         '
-        Me.LayoutControlItem4.Control = Me.txtWebservicePassword
-        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 48)
-        Me.LayoutControlItem4.Name = "LayoutControlItem4"
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(375, 24)
-        Me.LayoutControlItem4.Text = "Webservice Passwort"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(116, 13)
+        Me.LayoutControlItem2.Control = Me.txtWebserviceBaseurl
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem2.Name = "LayoutControlItem2"
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem2.Text = "Server Adresse"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(116, 13)
         '
         'LayoutControlItem3
         '
@@ -550,14 +599,14 @@ Partial Class frmConfig
         Me.LayoutControlItem3.Text = "Webservice Username"
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(116, 13)
         '
-        'LayoutControlItem2
+        'LayoutControlItem4
         '
-        Me.LayoutControlItem2.Control = Me.txtWebserviceBaseurl
-        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
-        Me.LayoutControlItem2.Name = "LayoutControlItem2"
-        Me.LayoutControlItem2.Size = New System.Drawing.Size(375, 24)
-        Me.LayoutControlItem2.Text = "Server Adresse"
-        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(116, 13)
+        Me.LayoutControlItem4.Control = Me.txtWebservicePassword
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 48)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(375, 24)
+        Me.LayoutControlItem4.Text = "Webservice Passwort"
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(116, 13)
         '
         'LayoutControlGroup2
         '
@@ -654,6 +703,9 @@ Partial Class frmConfig
         CType(Me.TBEDIXMLITEMSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DS_DD_ECM, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewSchema, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemSpinEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemMemoExEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemMemoEdit1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.tabPageConfig.ResumeLayout(False)
         CType(Me.GridConfig, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBMT_CONFIGBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@@ -669,9 +721,9 @@ Partial Class frmConfig
         CType(Me.txtWebserviceImportBasePath.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit()
@@ -746,4 +798,9 @@ Partial Class frmConfig
     Friend WithEvents LayoutControlItem5 As LayoutControlItem
     Friend WithEvents LayoutControlItem6 As LayoutControlItem
     Friend WithEvents EmptySpaceItem1 As EmptySpaceItem
+    Friend WithEvents colTABLE_NAME As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colTEMPLATE_NAME As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents RepositoryItemSpinEdit1 As Repository.RepositoryItemSpinEdit
+    Friend WithEvents RepositoryItemMemoEdit1 As Repository.RepositoryItemMemoEdit
+    Friend WithEvents RepositoryItemMemoExEdit1 As Repository.RepositoryItemMemoExEdit
 End Class
diff --git a/MultiTool.Form/frmConfig.resx b/MultiTool.Form/frmConfig.resx
index 08bc53e..daad873 100644
--- a/MultiTool.Form/frmConfig.resx
+++ b/MultiTool.Form/frmConfig.resx
@@ -123,6 +123,9 @@
   <metadata name="DS_DD_ECM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>194, 17</value>
   </metadata>
+  <metadata name="DS_DD_ECM.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>194, 17</value>
+  </metadata>
   <metadata name="TBMT_CONFIGBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>758, 17</value>
   </metadata>