diff --git a/GUIs.Common/DocumentResultList/Loader.vb b/GUIs.Common/DocumentResultList/Loader.vb
index 0c9d6627..c065dd43 100644
--- a/GUIs.Common/DocumentResultList/Loader.vb
+++ b/GUIs.Common/DocumentResultList/Loader.vb
@@ -29,10 +29,20 @@ Namespace DocumentResultList
             Cache = New Cache(pLogConfig, 104_900_000)
         End Sub
 
+        ''' <summary>
+        ''' Removes a Document from the cache
+        ''' </summary>
         Public Sub Invalidate(pDocument As Document)
             Cache.Remove(pDocument)
         End Sub
 
+        ''' <summary>
+        ''' Clears the cache completely
+        ''' </summary>
+        Public Sub ClearCache()
+            Cache.Clear()
+        End Sub
+
         Public Function Load(pObjectId As Long, pFullPath As String, Optional pForce As Boolean = False) As Document
             Dim oDocument As Document = Nothing
 
diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb
index a8d7f694..2aad87a8 100644
--- a/GUIs.Common/frmDocumentResultList.vb
+++ b/GUIs.Common/frmDocumentResultList.vb
@@ -381,8 +381,13 @@ Public Class frmDocumentResultList
         Else
             _IsLoading = True
             Try
+                ' Save the new results
                 _ResultLists = pResults
 
+                ' Remove the current document from 
+                Documentloader.ClearCache()
+
+                ' Update the grid
                 UpdateTotalResults()
                 UpdateGridData()
 
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb
index e87e9f09..5a81e742 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb
@@ -36,7 +36,6 @@ Partial Class frmAdmin_SourceSQL
         Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten()
         Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit()
         Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit()
-        Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit()
         Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit()
         Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit()
         Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit()
@@ -47,7 +46,6 @@ Partial Class frmAdmin_SourceSQL
         Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem()
@@ -66,7 +64,6 @@ Partial Class frmAdmin_SourceSQL
         CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -77,7 +74,6 @@ Partial Class frmAdmin_SourceSQL
         CType(Me.LayoutControlItem1, 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.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -100,7 +96,7 @@ Partial Class frmAdmin_SourceSQL
         Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
         Me.RibbonControl.ShowToolbarCustomizeItem = False
-        Me.RibbonControl.Size = New System.Drawing.Size(768, 66)
+        Me.RibbonControl.Size = New System.Drawing.Size(768, 63)
         Me.RibbonControl.StatusBar = Me.RibbonStatusBar
         Me.RibbonControl.Toolbar.ShowCustomizeItem = False
         '
@@ -150,17 +146,16 @@ Partial Class frmAdmin_SourceSQL
         'RibbonStatusBar
         '
         Me.RibbonStatusBar.ItemLinks.Add(Me.labelStatus)
-        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 585)
+        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 583)
         Me.RibbonStatusBar.Name = "RibbonStatusBar"
         Me.RibbonStatusBar.Ribbon = Me.RibbonControl
-        Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 22)
+        Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 24)
         '
         'LayoutControl1
         '
         Me.LayoutControl1.Controls.Add(Me.TextEdit1)
         Me.LayoutControl1.Controls.Add(Me.TextEdit2)
         Me.LayoutControl1.Controls.Add(Me.TextEdit3)
-        Me.LayoutControl1.Controls.Add(Me.TextEdit4)
         Me.LayoutControl1.Controls.Add(Me.TextEdit5)
         Me.LayoutControl1.Controls.Add(Me.MemoEdit1)
         Me.LayoutControl1.Controls.Add(Me.txtAddedWho)
@@ -168,22 +163,22 @@ Partial Class frmAdmin_SourceSQL
         Me.LayoutControl1.Controls.Add(Me.txtChangedWho)
         Me.LayoutControl1.Controls.Add(Me.TextEdit9)
         Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.LayoutControl1.Location = New System.Drawing.Point(0, 66)
+        Me.LayoutControl1.Location = New System.Drawing.Point(0, 63)
         Me.LayoutControl1.Name = "LayoutControl1"
         Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(816, 316, 650, 400)
         Me.LayoutControl1.Root = Me.Root
-        Me.LayoutControl1.Size = New System.Drawing.Size(768, 519)
+        Me.LayoutControl1.Size = New System.Drawing.Size(768, 520)
         Me.LayoutControl1.TabIndex = 2
         Me.LayoutControl1.Text = "LayoutControl1"
         '
         'TextEdit1
         '
         Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "GUID", True))
-        Me.TextEdit1.Location = New System.Drawing.Point(105, 20)
+        Me.TextEdit1.Location = New System.Drawing.Point(114, 20)
         Me.TextEdit1.MenuManager = Me.RibbonControl
         Me.TextEdit1.Name = "TextEdit1"
         Me.TextEdit1.Properties.ReadOnly = True
-        Me.TextEdit1.Size = New System.Drawing.Size(643, 20)
+        Me.TextEdit1.Size = New System.Drawing.Size(634, 20)
         Me.TextEdit1.StyleController = Me.LayoutControl1
         Me.TextEdit1.TabIndex = 4
         '
@@ -200,96 +195,86 @@ Partial Class frmAdmin_SourceSQL
         'TextEdit2
         '
         Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ENTITY_TITLE", True))
-        Me.TextEdit2.Location = New System.Drawing.Point(105, 60)
+        Me.TextEdit2.Location = New System.Drawing.Point(114, 60)
         Me.TextEdit2.MenuManager = Me.RibbonControl
         Me.TextEdit2.Name = "TextEdit2"
-        Me.TextEdit2.Size = New System.Drawing.Size(643, 20)
+        Me.TextEdit2.Size = New System.Drawing.Size(634, 20)
         Me.TextEdit2.StyleController = Me.LayoutControl1
         Me.TextEdit2.TabIndex = 5
         '
         'TextEdit3
         '
         Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "PK_COLUMN", True))
-        Me.TextEdit3.Location = New System.Drawing.Point(105, 100)
+        Me.TextEdit3.Location = New System.Drawing.Point(114, 100)
         Me.TextEdit3.MenuManager = Me.RibbonControl
         Me.TextEdit3.Name = "TextEdit3"
-        Me.TextEdit3.Size = New System.Drawing.Size(643, 20)
+        Me.TextEdit3.Size = New System.Drawing.Size(634, 20)
         Me.TextEdit3.StyleController = Me.LayoutControl1
         Me.TextEdit3.TabIndex = 6
         '
-        'TextEdit4
-        '
-        Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "FK_COLUMN", True))
-        Me.TextEdit4.Location = New System.Drawing.Point(105, 140)
-        Me.TextEdit4.MenuManager = Me.RibbonControl
-        Me.TextEdit4.Name = "TextEdit4"
-        Me.TextEdit4.Size = New System.Drawing.Size(643, 20)
-        Me.TextEdit4.StyleController = Me.LayoutControl1
-        Me.TextEdit4.TabIndex = 7
-        '
         'TextEdit5
         '
         Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SCOPE", True))
-        Me.TextEdit5.Location = New System.Drawing.Point(105, 180)
+        Me.TextEdit5.Location = New System.Drawing.Point(114, 140)
         Me.TextEdit5.MenuManager = Me.RibbonControl
         Me.TextEdit5.Name = "TextEdit5"
-        Me.TextEdit5.Size = New System.Drawing.Size(643, 20)
+        Me.TextEdit5.Size = New System.Drawing.Size(634, 20)
         Me.TextEdit5.StyleController = Me.LayoutControl1
         Me.TextEdit5.TabIndex = 8
         '
         'MemoEdit1
         '
         Me.MemoEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SQL_COMMAND", True))
-        Me.MemoEdit1.Location = New System.Drawing.Point(105, 220)
+        Me.MemoEdit1.Location = New System.Drawing.Point(114, 180)
         Me.MemoEdit1.MenuManager = Me.RibbonControl
         Me.MemoEdit1.Name = "MemoEdit1"
         Me.MemoEdit1.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.MemoEdit1.Properties.Appearance.Options.UseFont = True
-        Me.MemoEdit1.Size = New System.Drawing.Size(643, 127)
+        Me.MemoEdit1.Size = New System.Drawing.Size(634, 147)
         Me.MemoEdit1.StyleController = Me.LayoutControl1
         Me.MemoEdit1.TabIndex = 9
         '
         'txtAddedWho
         '
         Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHO", True))
-        Me.txtAddedWho.Location = New System.Drawing.Point(105, 367)
+        Me.txtAddedWho.Location = New System.Drawing.Point(114, 347)
         Me.txtAddedWho.MenuManager = Me.RibbonControl
         Me.txtAddedWho.Name = "txtAddedWho"
         Me.txtAddedWho.Properties.ReadOnly = True
-        Me.txtAddedWho.Size = New System.Drawing.Size(269, 20)
+        Me.txtAddedWho.Size = New System.Drawing.Size(260, 20)
         Me.txtAddedWho.StyleController = Me.LayoutControl1
         Me.txtAddedWho.TabIndex = 10
         '
         'TextEdit7
         '
         Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHEN", True))
-        Me.TextEdit7.Location = New System.Drawing.Point(479, 367)
+        Me.TextEdit7.Location = New System.Drawing.Point(488, 347)
         Me.TextEdit7.MenuManager = Me.RibbonControl
         Me.TextEdit7.Name = "TextEdit7"
         Me.TextEdit7.Properties.ReadOnly = True
-        Me.TextEdit7.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit7.Size = New System.Drawing.Size(260, 20)
         Me.TextEdit7.StyleController = Me.LayoutControl1
         Me.TextEdit7.TabIndex = 11
         '
         'txtChangedWho
         '
         Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHO", True))
-        Me.txtChangedWho.Location = New System.Drawing.Point(105, 407)
+        Me.txtChangedWho.Location = New System.Drawing.Point(114, 387)
         Me.txtChangedWho.MenuManager = Me.RibbonControl
         Me.txtChangedWho.Name = "txtChangedWho"
         Me.txtChangedWho.Properties.ReadOnly = True
-        Me.txtChangedWho.Size = New System.Drawing.Size(269, 20)
+        Me.txtChangedWho.Size = New System.Drawing.Size(260, 20)
         Me.txtChangedWho.StyleController = Me.LayoutControl1
         Me.txtChangedWho.TabIndex = 12
         '
         'TextEdit9
         '
         Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHEN", True))
-        Me.TextEdit9.Location = New System.Drawing.Point(479, 407)
+        Me.TextEdit9.Location = New System.Drawing.Point(488, 387)
         Me.TextEdit9.MenuManager = Me.RibbonControl
         Me.TextEdit9.Name = "TextEdit9"
         Me.TextEdit9.Properties.ReadOnly = True
-        Me.TextEdit9.Size = New System.Drawing.Size(269, 20)
+        Me.TextEdit9.Size = New System.Drawing.Size(260, 20)
         Me.TextEdit9.StyleController = Me.LayoutControl1
         Me.TextEdit9.TabIndex = 13
         '
@@ -297,9 +282,9 @@ Partial Class frmAdmin_SourceSQL
         '
         Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
         Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.EmptySpaceItem1, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem10})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.EmptySpaceItem1, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem10})
         Me.Root.Name = "Root"
-        Me.Root.Size = New System.Drawing.Size(768, 519)
+        Me.Root.Size = New System.Drawing.Size(768, 520)
         Me.Root.TextVisible = False
         '
         'LayoutControlItem1
@@ -332,20 +317,10 @@ Partial Class frmAdmin_SourceSQL
         Me.LayoutControlItem3.Text = "Primary Key"
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(82, 13)
         '
-        'LayoutControlItem4
-        '
-        Me.LayoutControlItem4.Control = Me.TextEdit4
-        Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120)
-        Me.LayoutControlItem4.Name = "LayoutControlItem4"
-        Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(748, 40)
-        Me.LayoutControlItem4.Text = "Foreign Key"
-        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13)
-        '
         'LayoutControlItem5
         '
         Me.LayoutControlItem5.Control = Me.TextEdit5
-        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160)
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 120)
         Me.LayoutControlItem5.Name = "LayoutControlItem5"
         Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem5.Size = New System.Drawing.Size(748, 40)
@@ -355,25 +330,25 @@ Partial Class frmAdmin_SourceSQL
         'LayoutControlItem6
         '
         Me.LayoutControlItem6.Control = Me.MemoEdit1
-        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 200)
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 160)
         Me.LayoutControlItem6.Name = "LayoutControlItem6"
         Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 147)
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 167)
         Me.LayoutControlItem6.Text = "SQL Command"
         Me.LayoutControlItem6.TextSize = New System.Drawing.Size(82, 13)
         '
         'EmptySpaceItem1
         '
         Me.EmptySpaceItem1.AllowHotTrack = False
-        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 427)
+        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 407)
         Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
-        Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 72)
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 93)
         Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
         '
         'LayoutControlItem7
         '
         Me.LayoutControlItem7.Control = Me.txtAddedWho
-        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 347)
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 327)
         Me.LayoutControlItem7.Name = "LayoutControlItem7"
         Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem7.Size = New System.Drawing.Size(374, 40)
@@ -383,7 +358,7 @@ Partial Class frmAdmin_SourceSQL
         'LayoutControlItem9
         '
         Me.LayoutControlItem9.Control = Me.txtChangedWho
-        Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 387)
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 367)
         Me.LayoutControlItem9.Name = "LayoutControlItem9"
         Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem9.Size = New System.Drawing.Size(374, 40)
@@ -393,7 +368,7 @@ Partial Class frmAdmin_SourceSQL
         'LayoutControlItem8
         '
         Me.LayoutControlItem8.Control = Me.TextEdit7
-        Me.LayoutControlItem8.Location = New System.Drawing.Point(374, 347)
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(374, 327)
         Me.LayoutControlItem8.Name = "LayoutControlItem8"
         Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem8.Size = New System.Drawing.Size(374, 40)
@@ -403,7 +378,7 @@ Partial Class frmAdmin_SourceSQL
         'LayoutControlItem10
         '
         Me.LayoutControlItem10.Control = Me.TextEdit9
-        Me.LayoutControlItem10.Location = New System.Drawing.Point(374, 387)
+        Me.LayoutControlItem10.Location = New System.Drawing.Point(374, 367)
         Me.LayoutControlItem10.Name = "LayoutControlItem10"
         Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
         Me.LayoutControlItem10.Size = New System.Drawing.Size(374, 40)
@@ -420,8 +395,13 @@ Partial Class frmAdmin_SourceSQL
         Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing
         Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Me.TBZF_ADMIN_SOURCE_SQLTableAdapter
         Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
+        Me.TableAdapterManager.VWIDB_BE_ATTRIBUTETableAdapter = Nothing
         '
         'frmAdmin_SourceSQL
         '
@@ -444,7 +424,6 @@ Partial Class frmAdmin_SourceSQL
         CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
@@ -455,7 +434,6 @@ Partial Class frmAdmin_SourceSQL
         CType(Me.LayoutControlItem1, 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.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -480,14 +458,12 @@ Partial Class frmAdmin_SourceSQL
     Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit
     Friend WithEvents TextEdit2 As DevExpress.XtraEditors.TextEdit
     Friend WithEvents TextEdit3 As DevExpress.XtraEditors.TextEdit
-    Friend WithEvents TextEdit4 As DevExpress.XtraEditors.TextEdit
     Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit
     Friend WithEvents MemoEdit1 As DevExpress.XtraEditors.MemoEdit
     Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
     Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
-    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
     Friend WithEvents DSIDB_Stammdaten As DSIDB_Stammdaten
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
index 8f30de15..680afd09 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
@@ -141,7 +141,7 @@ Partial Class frmAdmin_Start
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl1.ShowToolbarCustomizeItem = False
-        Me.RibbonControl1.Size = New System.Drawing.Size(1077, 160)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1077, 158)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
         '
@@ -396,10 +396,10 @@ Partial Class frmAdmin_Start
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 652)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 22)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 24)
         '
         'RibbonPage2
         '
@@ -431,6 +431,8 @@ Partial Class frmAdmin_Start
         Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 9, 4, 4, -1, "CW_PROFILES")
         Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1)
         Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 11, 3, 3, -1, "META_SOURCE_SQL")
+        Me.TreeListMenu.AppendNode(New Object() {"User Management"}, -1, 11, 11, -1)
+        Me.TreeListMenu.AppendNode(New Object() {"User List"}, 13, 5, 5, -1, "USER_OVERVIEW")
         Me.TreeListMenu.EndUnboundLoad()
         Me.TreeListMenu.OptionsBehavior.Editable = False
         Me.TreeListMenu.OptionsView.ShowColumns = False
@@ -438,7 +440,7 @@ Partial Class frmAdmin_Start
         Me.TreeListMenu.OptionsView.ShowIndicator = False
         Me.TreeListMenu.OptionsView.ShowVertLines = False
         Me.TreeListMenu.SelectImageList = Me.MainTreeImages
-        Me.TreeListMenu.Size = New System.Drawing.Size(193, 445)
+        Me.TreeListMenu.Size = New System.Drawing.Size(193, 465)
         Me.TreeListMenu.TabIndex = 8
         '
         'TreeListColumn1
@@ -462,6 +464,7 @@ Partial Class frmAdmin_Start
         Me.MainTreeImages.Add("open", "image://svgimages/actions/open.svg")
         Me.MainTreeImages.Add("managerelations", "image://svgimages/spreadsheet/managerelations.svg")
         Me.MainTreeImages.Add("bo_state", "image://svgimages/business objects/bo_state.svg")
+        Me.MainTreeImages.Add("actions_user", "image://svgimages/icon builder/actions_user.svg")
         '
         'DockManager1
         '
@@ -474,7 +477,7 @@ Partial Class frmAdmin_Start
         Me.DockPanel1.Controls.Add(Me.DockPanel1_Container)
         Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left
         Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799")
-        Me.DockPanel1.Location = New System.Drawing.Point(0, 160)
+        Me.DockPanel1.Location = New System.Drawing.Point(0, 158)
         Me.DockPanel1.Name = "DockPanel1"
         Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200)
         Me.DockPanel1.Size = New System.Drawing.Size(200, 494)
@@ -483,9 +486,9 @@ Partial Class frmAdmin_Start
         'DockPanel1_Container
         '
         Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu)
-        Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46)
+        Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26)
         Me.DockPanel1_Container.Name = "DockPanel1_Container"
-        Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 445)
+        Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 465)
         Me.DockPanel1_Container.TabIndex = 0
         '
         'TBIDB_ATTRIBUTEBindingSource
@@ -505,6 +508,7 @@ Partial Class frmAdmin_Start
         Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing
         Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing
@@ -539,7 +543,7 @@ Partial Class frmAdmin_Start
         '
         Me.Panel1.Controls.Add(Me.labelTitle)
         Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Panel1.Location = New System.Drawing.Point(200, 160)
+        Me.Panel1.Location = New System.Drawing.Point(200, 158)
         Me.Panel1.Name = "Panel1"
         Me.Panel1.Size = New System.Drawing.Size(877, 40)
         Me.Panel1.TabIndex = 8
@@ -742,7 +746,7 @@ Partial Class frmAdmin_Start
         'GridMain
         '
         Me.GridMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.GridMain.Location = New System.Drawing.Point(200, 200)
+        Me.GridMain.Location = New System.Drawing.Point(200, 198)
         Me.GridMain.MainView = Me.ViewMain
         Me.GridMain.MenuManager = Me.RibbonControl1
         Me.GridMain.Name = "GridMain"
diff --git a/GUIs.ZooFlow/App.config b/GUIs.ZooFlow/App.config
index f1cb9634..61f306be 100644
--- a/GUIs.ZooFlow/App.config
+++ b/GUIs.ZooFlow/App.config
@@ -10,9 +10,12 @@
     </sectionGroup>
   </configSections>
   <connectionStrings>
-    <add name="DigitalData.GUIs.ZooFlow.Settings.IDBConnectionStringDEFAULT" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
-    <add name="DigitalData.GUIs.ZooFlow.Settings.ECMConnectionStringDEFAULT" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd" />
-    <add name="DigitalData.GUIs.ZooFlow.Settings.DD_ECMConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
+    <add name="DigitalData.GUIs.ZooFlow.Settings.IDBConnectionStringDEFAULT"
+      connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB;Persist Security Info=True;User ID=sa;Password=dd"
+      providerName="System.Data.SqlClient" />
+    <add name="DigitalData.GUIs.ZooFlow.Settings.DD_ECMConnectionString"
+      connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
+      providerName="System.Data.SqlClient" />
   </connectionStrings>
   <applicationSettings>
     <DigitalData.GUIs.ZooFlow.Settings>
diff --git a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb
index 0d566d89..abc66997 100644
--- a/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb
+++ b/GUIs.ZooFlow/DBCW_Stammdaten.Designer.vb
@@ -3993,7 +3993,7 @@ Namespace DBCW_StammdatenTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -4558,7 +4558,7 @@ Namespace DBCW_StammdatenTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
diff --git a/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb
index 81aacbbd..de110aad 100644
--- a/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb
+++ b/GUIs.ZooFlow/DSDD_Stammdaten.Designer.vb
@@ -1331,7 +1331,7 @@ Namespace DSDD_StammdatenTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb
index 0504a777..02cdd0d7 100644
--- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb
+++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb
@@ -2445,8 +2445,6 @@ Partial Public Class DSIDB_Stammdaten
         
         Private columnCHANGED_WHEN As Global.System.Data.DataColumn
         
-        Private columnFK_COLUMN 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()
@@ -2570,14 +2568,6 @@ Partial Public Class DSIDB_Stammdaten
             End Get
         End Property
         
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public ReadOnly Property FK_COLUMNColumn() As Global.System.Data.DataColumn
-            Get
-                Return Me.columnFK_COLUMN
-            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)>  _
@@ -2615,9 +2605,9 @@ Partial Public Class DSIDB_Stammdaten
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Overloads Function AddTBZF_ADMIN_SOURCE_SQLRow(ByVal PARENT_ID As Integer, ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal FK_COLUMN As String) As TBZF_ADMIN_SOURCE_SQLRow
+        Public Overloads Function AddTBZF_ADMIN_SOURCE_SQLRow(ByVal PARENT_ID As Integer, ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBZF_ADMIN_SOURCE_SQLRow
             Dim rowTBZF_ADMIN_SOURCE_SQLRow As TBZF_ADMIN_SOURCE_SQLRow = CType(Me.NewRow,TBZF_ADMIN_SOURCE_SQLRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN}
+            Dim columnValuesArray() As Object = New Object() {Nothing, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN}
             rowTBZF_ADMIN_SOURCE_SQLRow.ItemArray = columnValuesArray
             Me.Rows.Add(rowTBZF_ADMIN_SOURCE_SQLRow)
             Return rowTBZF_ADMIN_SOURCE_SQLRow
@@ -2657,7 +2647,6 @@ Partial Public Class DSIDB_Stammdaten
             Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN")
             Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO")
             Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN")
-            Me.columnFK_COLUMN = MyBase.Columns("FK_COLUMN")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -2685,8 +2674,6 @@ Partial Public Class DSIDB_Stammdaten
             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.columnFK_COLUMN = New Global.System.Data.DataColumn("FK_COLUMN", GetType(String), Nothing, Global.System.Data.MappingType.Element)
-            MyBase.Columns.Add(Me.columnFK_COLUMN)
             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
@@ -2707,7 +2694,6 @@ Partial Public Class DSIDB_Stammdaten
             Me.columnSQL_COMMAND.MaxLength = 2147483647
             Me.columnADDED_WHO.MaxLength = 30
             Me.columnCHANGED_WHO.MaxLength = 30
-            Me.columnFK_COLUMN.MaxLength = 100
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -6379,21 +6365,6 @@ Partial Public Class DSIDB_Stammdaten
             End Set
         End Property
         
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Property FK_COLUMN() As String
-            Get
-                Try 
-                    Return CType(Me(Me.tableTBZF_ADMIN_SOURCE_SQL.FK_COLUMNColumn),String)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FK_COLUMN in Tabelle TBZF_ADMIN_SOURCE_SQL ist DBNull.", e)
-                End Try
-            End Get
-            Set
-                Me(Me.tableTBZF_ADMIN_SOURCE_SQL.FK_COLUMNColumn) = value
-            End Set
-        End Property
-        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Function IsPARENT_IDNull() As Boolean
@@ -6465,18 +6436,6 @@ Partial Public Class DSIDB_Stammdaten
         Public Sub SetCHANGED_WHENNull()
             Me(Me.tableTBZF_ADMIN_SOURCE_SQL.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 IsFK_COLUMNNull() As Boolean
-            Return Me.IsNull(Me.tableTBZF_ADMIN_SOURCE_SQL.FK_COLUMNColumn)
-        End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Sub SetFK_COLUMNNull()
-            Me(Me.tableTBZF_ADMIN_SOURCE_SQL.FK_COLUMNColumn) = Global.System.Convert.DBNull
-        End Sub
     End Class
     
     '''<summary>
@@ -9280,7 +9239,6 @@ Namespace DSIDB_StammdatenTableAdapters
             tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN")
             tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO")
             tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN")
-            tableMapping.ColumnMappings.Add("FK_COLUMN", "FK_COLUMN")
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -9289,81 +9247,53 @@ Namespace DSIDB_StammdatenTableAdapters
             Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBZF_ADMIN_SOURCE_SQL] ([PARENT_ID], [ENTITY_TITLE], [SCOPE], [PK_CO"& _ 
-                "LUMN], [COMMENT], [SQL_COMMAND], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHAN"& _ 
-                "GED_WHEN], [FK_COLUMN]) VALUES (@PARENT_ID, @ENTITY_TITLE, @SCOPE, @PK_COLUMN, @"& _ 
-                "COMMENT, @SQL_COMMAND, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @FK"& _ 
-                "_COLUMN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_"& _ 
-                "COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN FROM TBZF_A"& _ 
-                "DMIN_SOURCE_SQL WHERE (GUID = SCOPE_IDENTITY())"
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBZF_ADMIN_SOURCE_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (PARENT_ID, ENTITY_TI"& _ 
+                "TLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO,"& _ 
+                " CHANGED_WHEN)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PARENT_ID,@ENTITY_TITLE,@SCOPE,@PK_COLUMN,@COMME"& _ 
+                "NT,@SQL_COMMAND,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUI"& _ 
+                "D, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, A"& _ 
+                "DDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = SC"& _ 
+                "OPE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SCOPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SCOPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
-            Me._adapter.UpdateCommand.CommandText = "UPDATE [TBZF_ADMIN_SOURCE_SQL] SET [PARENT_ID] = @PARENT_ID, [ENTITY_TITLE] = @EN"& _ 
-                "TITY_TITLE, [SCOPE] = @SCOPE, [PK_COLUMN] = @PK_COLUMN, [COMMENT] = @COMMENT, [S"& _ 
-                "QL_COMMAND] = @SQL_COMMAND, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN"& _ 
-                ", [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [FK_COLUMN] = @F"& _ 
-                "K_COLUMN WHERE (([GUID] = @Original_GUID) AND ([PARENT_ID] = @Original_PARENT_ID"& _ 
-                ") AND ([ENTITY_TITLE] = @Original_ENTITY_TITLE) AND ([SCOPE] = @Original_SCOPE) "& _ 
-                "AND ([PK_COLUMN] = @Original_PK_COLUMN) AND ((@IsNull_COMMENT = 1 AND [COMMENT] "& _ 
-                "IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [AD"& _ 
-                "DED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WH"& _ 
-                "EN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ("& _ 
-                "(@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Origina"& _ 
-                "l_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR (["& _ 
-                "CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_FK_COLUMN = 1 AND [FK_COL"& _ 
-                "UMN] IS NULL) OR ([FK_COLUMN] = @Original_FK_COLUMN)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PARENT_ID,"& _ 
-                " ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CH"& _ 
-                "ANGED_WHO, CHANGED_WHEN, FK_COLUMN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @GUI"& _ 
-                "D)"
+            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBZF_ADMIN_SOURCE_SQL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                PARENT_ID = @PARENT_ID, EN"& _ 
+                "TITY_TITLE = @ENTITY_TITLE, SCOPE = @SCOPE, PK_COLUMN = @PK_COLUMN, COMMENT = @C"& _ 
+                "OMMENT, SQL_COMMAND = @SQL_COMMAND, ADDED_WHO = @ADDED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                  "& _ 
+                "       ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHA"& _ 
+                "NGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PARENT_ID, ENT"& _ 
+                "ITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGE"& _ 
+                "D_WHO, CHANGED_WHEN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SCOPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.NVarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PARENT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SCOPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FK_COLUMN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FK_COLUMN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FK_COLUMN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_TITLE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SCOPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SCOPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PK_COLUMN", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PK_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -9372,8 +9302,9 @@ Namespace DSIDB_StammdatenTableAdapters
             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        TBZF_ADMIN_SOURCE_SQL.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBZF_ADMIN_SOURCE_SQL WHER"& _ 
-                "E GUID = @GUID"
+            Me._commandCollection(0).CommandText = "SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADD"& _ 
+                "ED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBZF_ADMIN_SOURCE_SQL WHERE ("& _ 
+                "GUID = @GUID)"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
@@ -9457,12 +9388,8 @@ Namespace DSIDB_StammdatenTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal PARENT_ID As Global.System.Nullable(Of Integer), ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal FK_COLUMN As String) As Integer
-            If (PARENT_ID.HasValue = true) Then
-                Me.Adapter.InsertCommand.Parameters(0).Value = CType(PARENT_ID.Value,Integer)
-            Else
-                Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value
-            End If
+        Public Overloads Overridable Function Insert(ByVal PARENT_ID As Integer, ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer
+            Me.Adapter.InsertCommand.Parameters(0).Value = CType(PARENT_ID,Integer)
             If (ENTITY_TITLE Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("ENTITY_TITLE")
             Else
@@ -9508,11 +9435,6 @@ Namespace DSIDB_StammdatenTableAdapters
             Else
                 Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value
             End If
-            If (FK_COLUMN Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(10).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.InsertCommand.Parameters(10).Value = CType(FK_COLUMN,String)
-            End If
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
             If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -9532,35 +9454,8 @@ Namespace DSIDB_StammdatenTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update( _
-                    ByVal PARENT_ID As Global.System.Nullable(Of Integer),  _
-                    ByVal ENTITY_TITLE As String,  _
-                    ByVal SCOPE As String,  _
-                    ByVal PK_COLUMN As String,  _
-                    ByVal COMMENT As String,  _
-                    ByVal SQL_COMMAND As String,  _
-                    ByVal ADDED_WHO As String,  _
-                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal CHANGED_WHO As String,  _
-                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal FK_COLUMN As String,  _
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_PARENT_ID As Global.System.Nullable(Of Integer),  _
-                    ByVal Original_ENTITY_TITLE As String,  _
-                    ByVal Original_SCOPE As String,  _
-                    ByVal Original_PK_COLUMN As String,  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_ADDED_WHO As String,  _
-                    ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_CHANGED_WHO As String,  _
-                    ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_FK_COLUMN As String,  _
-                    ByVal GUID As Integer) As Integer
-            If (PARENT_ID.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PARENT_ID.Value,Integer)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value
-            End If
+        Public Overloads Overridable Function Update(ByVal PARENT_ID As Integer, ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
+            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PARENT_ID,Integer)
             If (ENTITY_TITLE Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("ENTITY_TITLE")
             Else
@@ -9606,75 +9501,8 @@ Namespace DSIDB_StammdatenTableAdapters
             Else
                 Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value
             End If
-            If (FK_COLUMN Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(10).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(10).Value = CType(FK_COLUMN,String)
-            End If
-            Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_GUID,Integer)
-            If (Original_PARENT_ID.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PARENT_ID.Value,Integer)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value
-            End If
-            If (Original_ENTITY_TITLE Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_ENTITY_TITLE")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_ENTITY_TITLE,String)
-            End If
-            If (Original_SCOPE Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_SCOPE")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_SCOPE,String)
-            End If
-            If (Original_PK_COLUMN Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_PK_COLUMN")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_PK_COLUMN,String)
-            End If
-            If (Original_COMMENT Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(16).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(17).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(16).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_COMMENT,String)
-            End If
-            If (Original_ADDED_WHO Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(18).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(19).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(18).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_ADDED_WHO,String)
-            End If
-            If (Original_ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(20).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(20).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(21).Value = Global.System.DBNull.Value
-            End If
-            If (Original_CHANGED_WHO Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(22).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(23).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(22).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_CHANGED_WHO,String)
-            End If
-            If (Original_CHANGED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(24).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_CHANGED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(24).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(25).Value = Global.System.DBNull.Value
-            End If
-            If (Original_FK_COLUMN Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(26).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(27).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(26).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_FK_COLUMN,String)
-            End If
-            Me.Adapter.UpdateCommand.Parameters(28).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(11).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -9689,36 +9517,6 @@ Namespace DSIDB_StammdatenTableAdapters
                 End If
             End Try
         End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update( _
-                    ByVal PARENT_ID As Global.System.Nullable(Of Integer),  _
-                    ByVal ENTITY_TITLE As String,  _
-                    ByVal SCOPE As String,  _
-                    ByVal PK_COLUMN As String,  _
-                    ByVal COMMENT As String,  _
-                    ByVal SQL_COMMAND As String,  _
-                    ByVal ADDED_WHO As String,  _
-                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal CHANGED_WHO As String,  _
-                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal FK_COLUMN As String,  _
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_PARENT_ID As Global.System.Nullable(Of Integer),  _
-                    ByVal Original_ENTITY_TITLE As String,  _
-                    ByVal Original_SCOPE As String,  _
-                    ByVal Original_PK_COLUMN As String,  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_ADDED_WHO As String,  _
-                    ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_CHANGED_WHO As String,  _
-                    ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_FK_COLUMN As String) As Integer
-            Return Me.Update(PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN, Original_GUID, Original_PARENT_ID, Original_ENTITY_TITLE, Original_SCOPE, Original_PK_COLUMN, Original_COMMENT, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_FK_COLUMN, Original_GUID)
-        End Function
     End Class
     
     '''<summary>
diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd
index 3437993e..206c4e6d 100644
--- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd
+++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd
@@ -2,10 +2,11 @@
 <xs:schema id="DSIDB_Stammdaten" targetNamespace="http://tempuri.org/DSIDB_Stammdaten.xsd" xmlns:mstns="http://tempuri.org/DSIDB_Stammdaten.xsd" xmlns="http://tempuri.org/DSIDB_Stammdaten.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
   <xs:annotation>
     <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
-      <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+      <DataSource DefaultConnectionIndex="2" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
         <Connections>
           <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="IDBConnectionStringDEFAULT" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="IDBConnectionStringDEFAULT (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.DigitalData.GUIs.ZooFlow.Settings.GlobalReference.Default.IDBConnectionStringDEFAULT" Provider="System.Data.SqlClient" />
           <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="ECMConnectionStringDEFAULT" IsAppSettingsProperty="true" Modifier="Assembly" Name="ECMConnectionStringDEFAULT (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.DigitalData.GUIs.ZooFlow.Settings.GlobalReference.Default.ECMConnectionStringDEFAULT" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="DD_ECMConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="DD_ECMConnectionString (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.DigitalData.GUIs.ZooFlow.Settings.GlobalReference.Default.DD_ECMConnectionString" Provider="System.Data.SqlClient" />
         </Connections>
         <Tables>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBIDB_BUSINESS_ENTITYTableAdapter" GeneratorDataComponentClassName="TBIDB_BUSINESS_ENTITYTableAdapter" Name="TBIDB_BUSINESS_ENTITY" UserDataComponentName="TBIDB_BUSINESS_ENTITYTableAdapter">
@@ -323,7 +324,7 @@ WHERE        (ATTR_ID = @ATTRIBUTE_ID) AND (LANG_ID = @LANGUAGE_ID)</CommandText
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBZF_ADMIN_SOURCE_SQLTableAdapter" GeneratorDataComponentClassName="TBZF_ADMIN_SOURCE_SQLTableAdapter" Name="TBZF_ADMIN_SOURCE_SQL" UserDataComponentName="TBZF_ADMIN_SOURCE_SQLTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="ECMConnectionStringDEFAULT (Settings)" DbObjectName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" 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 (Settings)" DbObjectName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" 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">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>DELETE FROM TBZF_ADMIN_SOURCE_SQL
@@ -334,67 +335,53 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [TBZF_ADMIN_SOURCE_SQL] ([PARENT_ID], [ENTITY_TITLE], [SCOPE], [PK_COLUMN], [COMMENT], [SQL_COMMAND], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [FK_COLUMN]) VALUES (@PARENT_ID, @ENTITY_TITLE, @SCOPE, @PK_COLUMN, @COMMENT, @SQL_COMMAND, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @FK_COLUMN);
-SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBZF_ADMIN_SOURCE_SQL
+                         (PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN)
+VALUES        (@PARENT_ID,@ENTITY_TITLE,@SCOPE,@PK_COLUMN,@COMMENT,@SQL_COMMAND,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN); 
+SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ENTITY_TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ENTITY_TITLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SCOPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SCOPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@FK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PARENT_ID" ColumnName="PARENT_ID" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ENTITY_TITLE" ColumnName="ENTITY_TITLE" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@ENTITY_TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="ENTITY_TITLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SCOPE" ColumnName="SCOPE" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SCOPE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SCOPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PK_COLUMN" ColumnName="PK_COLUMN" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_COMMAND" ColumnName="SQL_COMMAND" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" 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.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        TBZF_ADMIN_SOURCE_SQL.*
-FROM            TBZF_ADMIN_SOURCE_SQL WHERE GUID = @GUID</CommandText>
+                    <CommandText>SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBZF_ADMIN_SOURCE_SQL] SET [PARENT_ID] = @PARENT_ID, [ENTITY_TITLE] = @ENTITY_TITLE, [SCOPE] = @SCOPE, [PK_COLUMN] = @PK_COLUMN, [COMMENT] = @COMMENT, [SQL_COMMAND] = @SQL_COMMAND, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [FK_COLUMN] = @FK_COLUMN WHERE (([GUID] = @Original_GUID) AND ([PARENT_ID] = @Original_PARENT_ID) AND ([ENTITY_TITLE] = @Original_ENTITY_TITLE) AND ([SCOPE] = @Original_SCOPE) AND ([PK_COLUMN] = @Original_PK_COLUMN) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_FK_COLUMN = 1 AND [FK_COLUMN] IS NULL) OR ([FK_COLUMN] = @Original_FK_COLUMN)));
-SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @GUID)</CommandText>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>UPDATE       TBZF_ADMIN_SOURCE_SQL
+SET                PARENT_ID = @PARENT_ID, ENTITY_TITLE = @ENTITY_TITLE, SCOPE = @SCOPE, PK_COLUMN = @PK_COLUMN, COMMENT = @COMMENT, SQL_COMMAND = @SQL_COMMAND, ADDED_WHO = @ADDED_WHO, 
+                         ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN
+WHERE        (GUID = @Original_GUID);   
+SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ENTITY_TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ENTITY_TITLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SCOPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SCOPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="0" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@FK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ENTITY_TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ENTITY_TITLE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SCOPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SCOPE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_FK_COLUMN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="FK_COLUMN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_FK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PARENT_ID" ColumnName="PARENT_ID" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PARENT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PARENT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ENTITY_TITLE" ColumnName="ENTITY_TITLE" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@ENTITY_TITLE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="ENTITY_TITLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SCOPE" ColumnName="SCOPE" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SCOPE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SCOPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PK_COLUMN" ColumnName="PK_COLUMN" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PK_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PK_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_COMMAND" ColumnName="SQL_COMMAND" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" 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.TBZF_ADMIN_SOURCE_SQL" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBZF_ADMIN_SOURCE_SQL" 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.TBZF_ADMIN_SOURCE_SQL" 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.TBZF_ADMIN_SOURCE_SQL" 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>
@@ -412,7 +399,6 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD
               <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
               <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
               <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
-              <Mapping SourceColumn="FK_COLUMN" DataSetColumn="FK_COLUMN" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -760,7 +746,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
   <xs:element name="DSIDB_Stammdaten" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DSIDB_Stammdaten" msprop:Generator_UserDSName="DSIDB_Stammdaten">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBIDB_BUSINESS_ENTITY" msprop:Generator_TableClassName="TBIDB_BUSINESS_ENTITYDataTable" msprop:Generator_TableVarName="tableTBIDB_BUSINESS_ENTITY" msprop:Generator_TablePropName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowDeletingName="TBIDB_BUSINESS_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBIDB_BUSINESS_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_BUSINESS_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_BUSINESS_ENTITYRowDeleted" msprop:Generator_UserTableName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowChangedName="TBIDB_BUSINESS_ENTITYRowChanged" msprop:Generator_RowEvArgName="TBIDB_BUSINESS_ENTITYRowChangeEvent" msprop:Generator_RowClassName="TBIDB_BUSINESS_ENTITYRow">
+        <xs:element name="TBIDB_BUSINESS_ENTITY" msprop:Generator_TableClassName="TBIDB_BUSINESS_ENTITYDataTable" msprop:Generator_TableVarName="tableTBIDB_BUSINESS_ENTITY" msprop:Generator_RowChangedName="TBIDB_BUSINESS_ENTITYRowChanged" msprop:Generator_TablePropName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowDeletingName="TBIDB_BUSINESS_ENTITYRowDeleting" msprop:Generator_RowChangingName="TBIDB_BUSINESS_ENTITYRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_BUSINESS_ENTITYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_BUSINESS_ENTITYRowDeleted" msprop:Generator_RowClassName="TBIDB_BUSINESS_ENTITYRow" msprop:Generator_UserTableName="TBIDB_BUSINESS_ENTITY" msprop:Generator_RowEvArgName="TBIDB_BUSINESS_ENTITYRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -799,7 +785,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWIDB_BE_ATTRIBUTE" msprop:Generator_TableClassName="VWIDB_BE_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableVWIDB_BE_ATTRIBUTE" msprop:Generator_RowChangedName="VWIDB_BE_ATTRIBUTERowChanged" msprop:Generator_TablePropName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowDeletingName="VWIDB_BE_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="VWIDB_BE_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_BE_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_BE_ATTRIBUTERowDeleted" msprop:Generator_RowClassName="VWIDB_BE_ATTRIBUTERow" msprop:Generator_UserTableName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowEvArgName="VWIDB_BE_ATTRIBUTERowChangeEvent">
+        <xs:element name="VWIDB_BE_ATTRIBUTE" msprop:Generator_TableClassName="VWIDB_BE_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableVWIDB_BE_ATTRIBUTE" msprop:Generator_TablePropName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowDeletingName="VWIDB_BE_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="VWIDB_BE_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_BE_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_BE_ATTRIBUTERowDeleted" msprop:Generator_UserTableName="VWIDB_BE_ATTRIBUTE" msprop:Generator_RowChangedName="VWIDB_BE_ATTRIBUTERowChanged" msprop:Generator_RowEvArgName="VWIDB_BE_ATTRIBUTERowChangeEvent" msprop:Generator_RowClassName="VWIDB_BE_ATTRIBUTERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="BE_ID" msprop:Generator_ColumnVarNameInTable="columnBE_ID" msprop:Generator_ColumnPropNameInRow="BE_ID" msprop:Generator_ColumnPropNameInTable="BE_IDColumn" msprop:Generator_UserColumnName="BE_ID" type="xs:int" minOccurs="0" />
@@ -858,7 +844,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_ATTRIBUTE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTERowDeleted" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTERowChanged" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTERowChangeEvent" msprop:Generator_RowClassName="TBIDB_ATTRIBUTERow">
+        <xs:element name="TBIDB_ATTRIBUTE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTERowChanged" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTERowDeleted" msprop:Generator_RowClassName="TBIDB_ATTRIBUTERow" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -915,7 +901,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE_TYPE" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTE_TYPERowDeleted" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTE_TYPERowChanged" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTE_TYPERowChangeEvent" msprop:Generator_RowClassName="TBIDB_ATTRIBUTE_TYPERow">
+        <xs:element name="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBIDB_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBIDB_ATTRIBUTE_TYPERowChanged" msprop:Generator_TablePropName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBIDB_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBIDB_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_ATTRIBUTE_TYPERowDeleted" msprop:Generator_RowClassName="TBIDB_ATTRIBUTE_TYPERow" msprop:Generator_UserTableName="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_RowEvArgName="TBIDB_ATTRIBUTE_TYPERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -956,7 +942,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_TableClassName="TBZF_ADMIN_SOURCE_SQLDataTable" msprop:Generator_TableVarName="tableTBZF_ADMIN_SOURCE_SQL" msprop:Generator_TablePropName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowDeletingName="TBZF_ADMIN_SOURCE_SQLRowDeleting" msprop:Generator_RowChangingName="TBZF_ADMIN_SOURCE_SQLRowChanging" msprop:Generator_RowEvHandlerName="TBZF_ADMIN_SOURCE_SQLRowChangeEventHandler" msprop:Generator_RowDeletedName="TBZF_ADMIN_SOURCE_SQLRowDeleted" msprop:Generator_UserTableName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowChangedName="TBZF_ADMIN_SOURCE_SQLRowChanged" msprop:Generator_RowEvArgName="TBZF_ADMIN_SOURCE_SQLRowChangeEvent" msprop:Generator_RowClassName="TBZF_ADMIN_SOURCE_SQLRow">
+        <xs:element name="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_TableClassName="TBZF_ADMIN_SOURCE_SQLDataTable" msprop:Generator_TableVarName="tableTBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowChangedName="TBZF_ADMIN_SOURCE_SQLRowChanged" msprop:Generator_TablePropName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowDeletingName="TBZF_ADMIN_SOURCE_SQLRowDeleting" msprop:Generator_RowChangingName="TBZF_ADMIN_SOURCE_SQLRowChanging" msprop:Generator_RowEvHandlerName="TBZF_ADMIN_SOURCE_SQLRowChangeEventHandler" msprop:Generator_RowDeletedName="TBZF_ADMIN_SOURCE_SQLRowDeleted" msprop:Generator_RowClassName="TBZF_ADMIN_SOURCE_SQLRow" msprop:Generator_UserTableName="TBZF_ADMIN_SOURCE_SQL" msprop:Generator_RowEvArgName="TBZF_ADMIN_SOURCE_SQLRowChangeEvent">
           <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" />
@@ -1012,17 +998,10 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
                 </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="FK_COLUMN" msprop:Generator_ColumnVarNameInTable="columnFK_COLUMN" msprop:Generator_ColumnPropNameInRow="FK_COLUMN" msprop:Generator_ColumnPropNameInTable="FK_COLUMNColumn" msprop:Generator_UserColumnName="FK_COLUMN" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="100" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_OBJECT_STORE" msprop:Generator_TableClassName="TBIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableTBIDB_OBJECT_STORE" msprop:Generator_RowChangedName="TBIDB_OBJECT_STORERowChanged" msprop:Generator_TablePropName="TBIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="TBIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="TBIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_OBJECT_STORERowDeleted" msprop:Generator_RowClassName="TBIDB_OBJECT_STORERow" msprop:Generator_UserTableName="TBIDB_OBJECT_STORE" msprop:Generator_RowEvArgName="TBIDB_OBJECT_STORERowChangeEvent">
+        <xs:element name="TBIDB_OBJECT_STORE" msprop:Generator_TableClassName="TBIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableTBIDB_OBJECT_STORE" msprop:Generator_TablePropName="TBIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="TBIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="TBIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="TBIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_OBJECT_STORERowDeleted" msprop:Generator_UserTableName="TBIDB_OBJECT_STORE" msprop:Generator_RowChangedName="TBIDB_OBJECT_STORERowChanged" msprop:Generator_RowEvArgName="TBIDB_OBJECT_STORERowChangeEvent" msprop:Generator_RowClassName="TBIDB_OBJECT_STORERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1075,7 +1054,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_CATALOG" msprop:Generator_TableClassName="TBIDB_CATALOGDataTable" msprop:Generator_TableVarName="tableTBIDB_CATALOG" msprop:Generator_RowChangedName="TBIDB_CATALOGRowChanged" msprop:Generator_TablePropName="TBIDB_CATALOG" msprop:Generator_RowDeletingName="TBIDB_CATALOGRowDeleting" msprop:Generator_RowChangingName="TBIDB_CATALOGRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_CATALOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_CATALOGRowDeleted" msprop:Generator_RowClassName="TBIDB_CATALOGRow" msprop:Generator_UserTableName="TBIDB_CATALOG" msprop:Generator_RowEvArgName="TBIDB_CATALOGRowChangeEvent">
+        <xs:element name="TBIDB_CATALOG" msprop:Generator_TableClassName="TBIDB_CATALOGDataTable" msprop:Generator_TableVarName="tableTBIDB_CATALOG" msprop:Generator_TablePropName="TBIDB_CATALOG" msprop:Generator_RowDeletingName="TBIDB_CATALOGRowDeleting" msprop:Generator_RowChangingName="TBIDB_CATALOGRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_CATALOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_CATALOGRowDeleted" msprop:Generator_UserTableName="TBIDB_CATALOG" msprop:Generator_RowChangedName="TBIDB_CATALOGRowChanged" msprop:Generator_RowEvArgName="TBIDB_CATALOGRowChangeEvent" msprop:Generator_RowClassName="TBIDB_CATALOGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1112,7 +1091,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBWH_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBWH_ATTRIBUTE_TYPE" msprop:Generator_TablePropName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBWH_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBWH_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBWH_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ATTRIBUTE_TYPERowDeleted" msprop:Generator_UserTableName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBWH_ATTRIBUTE_TYPERowChanged" msprop:Generator_RowEvArgName="TBWH_ATTRIBUTE_TYPERowChangeEvent" msprop:Generator_RowClassName="TBWH_ATTRIBUTE_TYPERow">
+        <xs:element name="TBWH_ATTRIBUTE_TYPE" msprop:Generator_TableClassName="TBWH_ATTRIBUTE_TYPEDataTable" msprop:Generator_TableVarName="tableTBWH_ATTRIBUTE_TYPE" msprop:Generator_RowChangedName="TBWH_ATTRIBUTE_TYPERowChanged" msprop:Generator_TablePropName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowDeletingName="TBWH_ATTRIBUTE_TYPERowDeleting" msprop:Generator_RowChangingName="TBWH_ATTRIBUTE_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBWH_ATTRIBUTE_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_ATTRIBUTE_TYPERowDeleted" msprop:Generator_RowClassName="TBWH_ATTRIBUTE_TYPERow" msprop:Generator_UserTableName="TBWH_ATTRIBUTE_TYPE" msprop:Generator_RowEvArgName="TBWH_ATTRIBUTE_TYPERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -1126,7 +1105,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWIDB_OBJECT_STORE" msprop:Generator_TableClassName="VWIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableVWIDB_OBJECT_STORE" msprop:Generator_RowChangedName="VWIDB_OBJECT_STORERowChanged" msprop:Generator_TablePropName="VWIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="VWIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="VWIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_OBJECT_STORERowDeleted" msprop:Generator_RowClassName="VWIDB_OBJECT_STORERow" msprop:Generator_UserTableName="VWIDB_OBJECT_STORE" msprop:Generator_RowEvArgName="VWIDB_OBJECT_STORERowChangeEvent">
+        <xs:element name="VWIDB_OBJECT_STORE" msprop:Generator_TableClassName="VWIDB_OBJECT_STOREDataTable" msprop:Generator_TableVarName="tableVWIDB_OBJECT_STORE" msprop:Generator_TablePropName="VWIDB_OBJECT_STORE" msprop:Generator_RowDeletingName="VWIDB_OBJECT_STORERowDeleting" msprop:Generator_RowChangingName="VWIDB_OBJECT_STORERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_OBJECT_STORERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_OBJECT_STORERowDeleted" msprop:Generator_UserTableName="VWIDB_OBJECT_STORE" msprop:Generator_RowChangedName="VWIDB_OBJECT_STORERowChanged" msprop:Generator_RowEvArgName="VWIDB_OBJECT_STORERowChangeEvent" msprop:Generator_RowClassName="VWIDB_OBJECT_STORERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1164,7 +1143,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWIDB_DOCTYPES_DE" msprop:Generator_TableClassName="VWIDB_DOCTYPES_DEDataTable" msprop:Generator_TableVarName="tableVWIDB_DOCTYPES_DE" msprop:Generator_RowChangedName="VWIDB_DOCTYPES_DERowChanged" msprop:Generator_TablePropName="VWIDB_DOCTYPES_DE" msprop:Generator_RowDeletingName="VWIDB_DOCTYPES_DERowDeleting" msprop:Generator_RowChangingName="VWIDB_DOCTYPES_DERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_DOCTYPES_DERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_DOCTYPES_DERowDeleted" msprop:Generator_RowClassName="VWIDB_DOCTYPES_DERow" msprop:Generator_UserTableName="VWIDB_DOCTYPES_DE" msprop:Generator_RowEvArgName="VWIDB_DOCTYPES_DERowChangeEvent">
+        <xs:element name="VWIDB_DOCTYPES_DE" msprop:Generator_TableClassName="VWIDB_DOCTYPES_DEDataTable" msprop:Generator_TableVarName="tableVWIDB_DOCTYPES_DE" msprop:Generator_TablePropName="VWIDB_DOCTYPES_DE" msprop:Generator_RowDeletingName="VWIDB_DOCTYPES_DERowDeleting" msprop:Generator_RowChangingName="VWIDB_DOCTYPES_DERowChanging" msprop:Generator_RowEvHandlerName="VWIDB_DOCTYPES_DERowChangeEventHandler" msprop:Generator_RowDeletedName="VWIDB_DOCTYPES_DERowDeleted" msprop:Generator_UserTableName="VWIDB_DOCTYPES_DE" msprop:Generator_RowChangedName="VWIDB_DOCTYPES_DERowChanged" msprop:Generator_RowEvArgName="VWIDB_DOCTYPES_DERowChangeEvent" msprop:Generator_RowClassName="VWIDB_DOCTYPES_DERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Doctype" msprop:Generator_ColumnVarNameInTable="columnDoctype" msprop:Generator_ColumnPropNameInRow="Doctype" msprop:Generator_ColumnPropNameInTable="DoctypeColumn" msprop:Generator_UserColumnName="Doctype">
@@ -1177,7 +1156,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_DOCTYPE_HANDLING" msprop:Generator_TableClassName="TBIDB_DOCTYPE_HANDLINGDataTable" msprop:Generator_TableVarName="tableTBIDB_DOCTYPE_HANDLING" msprop:Generator_TablePropName="TBIDB_DOCTYPE_HANDLING" msprop:Generator_RowDeletingName="TBIDB_DOCTYPE_HANDLINGRowDeleting" msprop:Generator_RowChangingName="TBIDB_DOCTYPE_HANDLINGRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_DOCTYPE_HANDLINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_DOCTYPE_HANDLINGRowDeleted" msprop:Generator_UserTableName="TBIDB_DOCTYPE_HANDLING" msprop:Generator_RowChangedName="TBIDB_DOCTYPE_HANDLINGRowChanged" msprop:Generator_RowEvArgName="TBIDB_DOCTYPE_HANDLINGRowChangeEvent" msprop:Generator_RowClassName="TBIDB_DOCTYPE_HANDLINGRow">
+        <xs:element name="TBIDB_DOCTYPE_HANDLING" msprop:Generator_TableClassName="TBIDB_DOCTYPE_HANDLINGDataTable" msprop:Generator_TableVarName="tableTBIDB_DOCTYPE_HANDLING" msprop:Generator_RowChangedName="TBIDB_DOCTYPE_HANDLINGRowChanged" msprop:Generator_TablePropName="TBIDB_DOCTYPE_HANDLING" msprop:Generator_RowDeletingName="TBIDB_DOCTYPE_HANDLINGRowDeleting" msprop:Generator_RowChangingName="TBIDB_DOCTYPE_HANDLINGRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_DOCTYPE_HANDLINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_DOCTYPE_HANDLINGRowDeleted" msprop:Generator_RowClassName="TBIDB_DOCTYPE_HANDLINGRow" msprop:Generator_UserTableName="TBIDB_DOCTYPE_HANDLING" msprop:Generator_RowEvArgName="TBIDB_DOCTYPE_HANDLINGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1216,7 +1195,7 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBIDB_CATALOG_USER" msprop:Generator_TableClassName="TBIDB_CATALOG_USERDataTable" msprop:Generator_TableVarName="tableTBIDB_CATALOG_USER" msprop:Generator_RowChangedName="TBIDB_CATALOG_USERRowChanged" msprop:Generator_TablePropName="TBIDB_CATALOG_USER" msprop:Generator_RowDeletingName="TBIDB_CATALOG_USERRowDeleting" msprop:Generator_RowChangingName="TBIDB_CATALOG_USERRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_CATALOG_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_CATALOG_USERRowDeleted" msprop:Generator_RowClassName="TBIDB_CATALOG_USERRow" msprop:Generator_UserTableName="TBIDB_CATALOG_USER" msprop:Generator_RowEvArgName="TBIDB_CATALOG_USERRowChangeEvent">
+        <xs:element name="TBIDB_CATALOG_USER" msprop:Generator_TableClassName="TBIDB_CATALOG_USERDataTable" msprop:Generator_TableVarName="tableTBIDB_CATALOG_USER" msprop:Generator_TablePropName="TBIDB_CATALOG_USER" msprop:Generator_RowDeletingName="TBIDB_CATALOG_USERRowDeleting" msprop:Generator_RowChangingName="TBIDB_CATALOG_USERRowChanging" msprop:Generator_RowEvHandlerName="TBIDB_CATALOG_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBIDB_CATALOG_USERRowDeleted" msprop:Generator_UserTableName="TBIDB_CATALOG_USER" msprop:Generator_RowChangedName="TBIDB_CATALOG_USERRowChanged" msprop:Generator_RowEvArgName="TBIDB_CATALOG_USERRowChangeEvent" msprop:Generator_RowClassName="TBIDB_CATALOG_USERRow">
           <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" />
@@ -1282,9 +1261,9 @@ SELECT GUID, CAT_TITLE, CAT_STRING FROM TBIDB_CATALOG_USER WHERE (GUID = @GUID)<
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TYP_ID" msdata:parent="TBIDB_ATTRIBUTE_TYPE" msdata:child="TBIDB_ATTRIBUTE" msdata:parentkey="GUID" msdata:childkey="TYP_ID" msprop:Generator_UserChildTable="TBIDB_ATTRIBUTE" msprop:Generator_ChildPropName="GetTBIDB_ATTRIBUTERows" msprop:Generator_UserRelationName="FK_TYP_ID" msprop:Generator_RelationVarName="relationFK_TYP_ID" msprop:Generator_UserParentTable="TBIDB_ATTRIBUTE_TYPE" msprop:Generator_ParentPropName="TBIDB_ATTRIBUTE_TYPERow" />
-      <msdata:Relationship name="FK_OS_CAT_ID" msdata:parent="TBIDB_CATALOG" msdata:child="TBIDB_OBJECT_STORE" msdata:parentkey="GUID" msdata:childkey="CAT_ID" msprop:Generator_UserChildTable="TBIDB_OBJECT_STORE" msprop:Generator_ChildPropName="GetTBIDB_OBJECT_STORERows" msprop:Generator_UserRelationName="FK_OS_CAT_ID" msprop:Generator_ParentPropName="TBIDB_CATALOGRow" msprop:Generator_RelationVarName="relationFK_OS_CAT_ID" msprop:Generator_UserParentTable="TBIDB_CATALOG" />
-      <msdata:Relationship name="FK_TBIDB_DOCTYPE_HANDLING_CHNGACT" msdata:parent="TBIDB_CATALOG" msdata:child="TBIDB_DOCTYPE_HANDLING" msdata:parentkey="GUID" msdata:childkey="CHANGED_ACTION" msprop:Generator_UserChildTable="TBIDB_DOCTYPE_HANDLING" msprop:Generator_ChildPropName="GetTBIDB_DOCTYPE_HANDLINGRows" msprop:Generator_UserRelationName="FK_TBIDB_DOCTYPE_HANDLING_CHNGACT" msprop:Generator_ParentPropName="TBIDB_CATALOGRow" msprop:Generator_RelationVarName="relationFK_TBIDB_DOCTYPE_HANDLING_CHNGACT" msprop:Generator_UserParentTable="TBIDB_CATALOG" />
+      <msdata:Relationship name="FK_TYP_ID" msdata:parent="TBIDB_ATTRIBUTE_TYPE" msdata:child="TBIDB_ATTRIBUTE" msdata:parentkey="GUID" msdata:childkey="TYP_ID" msprop:Generator_UserChildTable="TBIDB_ATTRIBUTE" msprop:Generator_ChildPropName="GetTBIDB_ATTRIBUTERows" msprop:Generator_UserRelationName="FK_TYP_ID" msprop:Generator_ParentPropName="TBIDB_ATTRIBUTE_TYPERow" msprop:Generator_RelationVarName="relationFK_TYP_ID" msprop:Generator_UserParentTable="TBIDB_ATTRIBUTE_TYPE" />
+      <msdata:Relationship name="FK_OS_CAT_ID" msdata:parent="TBIDB_CATALOG" msdata:child="TBIDB_OBJECT_STORE" msdata:parentkey="GUID" msdata:childkey="CAT_ID" msprop:Generator_UserChildTable="TBIDB_OBJECT_STORE" msprop:Generator_ChildPropName="GetTBIDB_OBJECT_STORERows" msprop:Generator_UserRelationName="FK_OS_CAT_ID" msprop:Generator_RelationVarName="relationFK_OS_CAT_ID" msprop:Generator_UserParentTable="TBIDB_CATALOG" msprop:Generator_ParentPropName="TBIDB_CATALOGRow" />
+      <msdata:Relationship name="FK_TBIDB_DOCTYPE_HANDLING_CHNGACT" msdata:parent="TBIDB_CATALOG" msdata:child="TBIDB_DOCTYPE_HANDLING" msdata:parentkey="GUID" msdata:childkey="CHANGED_ACTION" msprop:Generator_UserChildTable="TBIDB_DOCTYPE_HANDLING" msprop:Generator_ChildPropName="GetTBIDB_DOCTYPE_HANDLINGRows" msprop:Generator_UserRelationName="FK_TBIDB_DOCTYPE_HANDLING_CHNGACT" msprop:Generator_RelationVarName="relationFK_TBIDB_DOCTYPE_HANDLING_CHNGACT" msprop:Generator_UserParentTable="TBIDB_CATALOG" msprop:Generator_ParentPropName="TBIDB_CATALOGRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss
index 5f4d2221..a488d767 100644
--- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss
+++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss
@@ -4,13 +4,13 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="101" ViewPortY="-27" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-28" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TBIDB_BUSINESS_ENTITY" ZOrder="15" X="48" Y="40" Height="248" Width="291" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:TBIDB_ATTRIBUTE" ZOrder="13" X="359" Y="42" Height="305" Width="251" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBIDB_ATTRIBUTE_TYPE" ZOrder="11" X="677" Y="46" Height="286" Width="285" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:VWIDB_BE_ATTRIBUTE" ZOrder="14" X="991" Y="49" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBZF_ADMIN_SOURCE_SQL" ZOrder="10" X="73" Y="378" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBZF_ADMIN_SOURCE_SQL" ZOrder="10" X="73" Y="378" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBIDB_OBJECT_STORE" ZOrder="9" X="474" Y="385" Height="267" Width="273" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
     <Shape ID="DesignTable:TBIDB_CATALOG" ZOrder="8" X="896" Y="419" Height="210" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:TBWH_ATTRIBUTE_TYPE" ZOrder="6" X="942" Y="715" Height="115" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
diff --git a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb
index 3e0c2781..3825440b 100644
--- a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb
+++ b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb
@@ -4323,7 +4323,7 @@ Namespace GlobixDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -4831,7 +4831,7 @@ Namespace GlobixDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5308,7 +5308,7 @@ Namespace GlobixDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5672,7 +5672,7 @@ Namespace GlobixDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
diff --git a/GUIs.ZooFlow/My Project/Settings.Designer.vb b/GUIs.ZooFlow/My Project/Settings.Designer.vb
index efeea361..b4064d29 100644
--- a/GUIs.ZooFlow/My Project/Settings.Designer.vb	
+++ b/GUIs.ZooFlow/My Project/Settings.Designer.vb	
@@ -14,7 +14,7 @@ Option Explicit On
 
 
 <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
- Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
+ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
  Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
 Partial Friend NotInheritable Class Settings
     Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -95,17 +95,6 @@ Partial Friend NotInheritable Class Settings
             Me("IDBOBJID") = value
         End Set
     End Property
-    
-    <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-     Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Passwo"& _ 
-        "rd=dd")>  _
-    Public ReadOnly Property ECMConnectionStringDEFAULT() As String
-        Get
-            Return CType(Me("ECMConnectionStringDEFAULT"),String)
-        End Get
-    End Property
 End Class
 
 Namespace My
diff --git a/GUIs.ZooFlow/My Project/Settings.settings b/GUIs.ZooFlow/My Project/Settings.settings
index 0dee0401..428b14b9 100644
--- a/GUIs.ZooFlow/My Project/Settings.settings	
+++ b/GUIs.ZooFlow/My Project/Settings.settings	
@@ -24,12 +24,5 @@
     <Setting Name="IDBOBJID" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
-    <Setting Name="ECMConnectionStringDEFAULT" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd&lt;/ConnectionString&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;User ID=sa;Password=dd</Value>
-    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/GUIs.ZooFlow/MyDataset.Designer.vb b/GUIs.ZooFlow/MyDataset.Designer.vb
index 96706fc2..0ddc0859 100644
--- a/GUIs.ZooFlow/MyDataset.Designer.vb
+++ b/GUIs.ZooFlow/MyDataset.Designer.vb
@@ -1662,7 +1662,7 @@ Namespace DSClipboardWatcherTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -1930,7 +1930,7 @@ Namespace DSClipboardWatcherTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Private Sub InitConnection()
             Me._connection = New Global.System.Data.SqlClient.SqlConnection()
-            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.ECMConnectionStringDEFAULT
+            Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.DD_ECMConnectionString
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _