diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DataFormatBrowserPopup.Designer.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DataFormatBrowserPopup.Designer.cs
index d27f18ea..1484d547 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DataFormatBrowserPopup.Designer.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/DataFormatBrowserPopup.Designer.cs
@@ -28,78 +28,81 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.txtSearch = new System.Windows.Forms.TextBox();
-            this.lv = new System.Windows.Forms.ListView();
-            this.chTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.chFilters = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.cmdClear = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // txtSearch
-            // 
-            this.txtSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.txtSearch = new System.Windows.Forms.TextBox();
+			this.lv = new System.Windows.Forms.ListView();
+			this.chTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.chFilters = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.cmdClear = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// txtSearch
+			// 
+			this.txtSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtSearch.Location = new System.Drawing.Point(6, 7);
-            this.txtSearch.Name = "txtSearch";
-            this.txtSearch.Size = new System.Drawing.Size(277, 13);
-            this.txtSearch.TabIndex = 0;
-            this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged);
-            this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
-            // 
-            // lv
-            // 
-            this.lv.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.lv.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+			this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.txtSearch.Location = new System.Drawing.Point(6, 7);
+			this.txtSearch.Name = "txtSearch";
+			this.txtSearch.Size = new System.Drawing.Size(277, 13);
+			this.txtSearch.TabIndex = 0;
+			this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged);
+			this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
+			// 
+			// lv
+			// 
+			this.lv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.lv.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.lv.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.chTitle,
             this.chFilters});
-            this.lv.FullRowSelect = true;
-            this.lv.GridLines = true;
-            this.lv.HideSelection = false;
-            this.lv.Location = new System.Drawing.Point(0, 26);
-            this.lv.MultiSelect = false;
-            this.lv.Name = "lv";
-            this.lv.Size = new System.Drawing.Size(364, 183);
-            this.lv.TabIndex = 1;
-            this.lv.UseCompatibleStateImageBehavior = false;
-            this.lv.View = System.Windows.Forms.View.Details;
-            this.lv.ItemActivate += new System.EventHandler(this.lv_ItemActivate);
-            this.lv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
-            // 
-            // chTitle
-            // 
-            this.chTitle.Text = "Title";
-            // 
-            // chFilters
-            // 
-            this.chFilters.Text = "Filters";
-            // 
-            // cmdClear
-            // 
-            this.cmdClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmdClear.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.cmdClear.Location = new System.Drawing.Point(289, 2);
-            this.cmdClear.Name = "cmdClear";
-            this.cmdClear.Size = new System.Drawing.Size(75, 23);
-            this.cmdClear.TabIndex = 5;
-            this.cmdClear.Text = "&Clear";
-            this.cmdClear.UseVisualStyleBackColor = false;
-            this.cmdClear.Click += new System.EventHandler(this.cmdClear_Click);
-            // 
-            // DataFormatBrowserPopup
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.Window;
-            this.ClientSize = new System.Drawing.Size(364, 213);
-            this.ControlBox = false;
-            this.Controls.Add(this.cmdClear);
-            this.Controls.Add(this.lv);
-            this.Controls.Add(this.txtSearch);
-            this.Name = "DataFormatBrowserPopup";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.lv.FullRowSelect = true;
+			this.lv.GridLines = true;
+			this.lv.HideSelection = false;
+			this.lv.Location = new System.Drawing.Point(0, 26);
+			this.lv.MultiSelect = false;
+			this.lv.Name = "lv";
+			this.lv.Size = new System.Drawing.Size(364, 183);
+			this.lv.TabIndex = 1;
+			this.lv.UseCompatibleStateImageBehavior = false;
+			this.lv.View = System.Windows.Forms.View.Details;
+			this.lv.ItemActivate += new System.EventHandler(this.lv_ItemActivate);
+			this.lv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
+			// 
+			// chTitle
+			// 
+			this.chTitle.Text = "Title";
+			// 
+			// chFilters
+			// 
+			this.chFilters.Text = "Filters";
+			// 
+			// cmdClear
+			// 
+			this.cmdClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.cmdClear.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdClear.Location = new System.Drawing.Point(289, 2);
+			this.cmdClear.Name = "cmdClear";
+			this.cmdClear.Size = new System.Drawing.Size(75, 23);
+			this.cmdClear.TabIndex = 5;
+			this.cmdClear.Text = "&Clear";
+			this.cmdClear.UseVisualStyleBackColor = false;
+			this.cmdClear.Click += new System.EventHandler(this.cmdClear_Click);
+			// 
+			// DataFormatBrowserPopup
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackColor = System.Drawing.SystemColors.Window;
+			this.ClientSize = new System.Drawing.Size(364, 213);
+			this.ControlBox = false;
+			this.Controls.Add(this.cmdClear);
+			this.Controls.Add(this.lv);
+			this.Controls.Add(this.txtSearch);
+			this.Name = "DataFormatBrowserPopup";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
         }
 
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.Designer.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.Designer.cs
index a7e970d8..6476efdd 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.Designer.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.Designer.cs
@@ -28,78 +28,87 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.lv = new System.Windows.Forms.ListView();
-            this.chTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.txtSearch = new System.Windows.Forms.TextBox();
-            this.cmdClear = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // lv
-            // 
-            this.lv.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.lv.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
-            this.chTitle,
-            this.chDescription});
-            this.lv.FullRowSelect = true;
-            this.lv.GridLines = true;
-            this.lv.HideSelection = false;
-            this.lv.Location = new System.Drawing.Point(0, 26);
-            this.lv.MultiSelect = false;
-            this.lv.Name = "lv";
-            this.lv.Size = new System.Drawing.Size(364, 183);
-            this.lv.TabIndex = 3;
-            this.lv.UseCompatibleStateImageBehavior = false;
-            this.lv.View = System.Windows.Forms.View.Details;
-            this.lv.ItemActivate += new System.EventHandler(this.lv_ItemActivate);
-            this.lv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
-            // 
-            // chTitle
-            // 
-            this.chTitle.Text = "Title";
-            // 
-            // chDescription
-            // 
-            this.chDescription.Text = "Description";
-            // 
-            // txtSearch
-            // 
-            this.txtSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+			this.lv = new System.Windows.Forms.ListView();
+			this.chTitle = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.chDescription = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.chAssembly = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+			this.txtSearch = new System.Windows.Forms.TextBox();
+			this.cmdClear = new System.Windows.Forms.Button();
+			this.SuspendLayout();
+			// 
+			// lv
+			// 
+			this.lv.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtSearch.Location = new System.Drawing.Point(6, 7);
-            this.txtSearch.Name = "txtSearch";
-            this.txtSearch.Size = new System.Drawing.Size(277, 13);
-            this.txtSearch.TabIndex = 2;
-            this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged);
-            this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
-            // 
-            // cmdClear
-            // 
-            this.cmdClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmdClear.FlatStyle = System.Windows.Forms.FlatStyle.System;
-            this.cmdClear.Location = new System.Drawing.Point(289, 2);
-            this.cmdClear.Name = "cmdClear";
-            this.cmdClear.Size = new System.Drawing.Size(75, 23);
-            this.cmdClear.TabIndex = 4;
-            this.cmdClear.Text = "&Clear";
-            this.cmdClear.UseVisualStyleBackColor = false;
-            this.cmdClear.Click += new System.EventHandler(this.cmdClear_Click);
-            // 
-            // ObjectModelBrowserPopup
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.Window;
-            this.ClientSize = new System.Drawing.Size(364, 213);
-            this.ControlBox = false;
-            this.Controls.Add(this.cmdClear);
-            this.Controls.Add(this.lv);
-            this.Controls.Add(this.txtSearch);
-            this.Name = "ObjectModelBrowserPopup";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
-            this.ResumeLayout(false);
-            this.PerformLayout();
+			this.lv.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.lv.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.chTitle,
+            this.chDescription,
+            this.chAssembly});
+			this.lv.FullRowSelect = true;
+			this.lv.GridLines = true;
+			this.lv.HideSelection = false;
+			this.lv.Location = new System.Drawing.Point(0, 26);
+			this.lv.MultiSelect = false;
+			this.lv.Name = "lv";
+			this.lv.Size = new System.Drawing.Size(364, 183);
+			this.lv.TabIndex = 3;
+			this.lv.UseCompatibleStateImageBehavior = false;
+			this.lv.View = System.Windows.Forms.View.Details;
+			this.lv.ItemActivate += new System.EventHandler(this.lv_ItemActivate);
+			this.lv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
+			// 
+			// chTitle
+			// 
+			this.chTitle.Text = "Title";
+			// 
+			// chDescription
+			// 
+			this.chDescription.Text = "Description";
+			// 
+			// chAssembly
+			// 
+			this.chAssembly.Text = "Assembly";
+			// 
+			// txtSearch
+			// 
+			this.txtSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.txtSearch.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			this.txtSearch.Location = new System.Drawing.Point(6, 7);
+			this.txtSearch.Name = "txtSearch";
+			this.txtSearch.Size = new System.Drawing.Size(277, 13);
+			this.txtSearch.TabIndex = 2;
+			this.txtSearch.TextChanged += new System.EventHandler(this.txtSearch_TextChanged);
+			this.txtSearch.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtSearch_KeyDown);
+			// 
+			// cmdClear
+			// 
+			this.cmdClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.cmdClear.FlatStyle = System.Windows.Forms.FlatStyle.System;
+			this.cmdClear.Location = new System.Drawing.Point(289, 2);
+			this.cmdClear.Name = "cmdClear";
+			this.cmdClear.Size = new System.Drawing.Size(75, 23);
+			this.cmdClear.TabIndex = 4;
+			this.cmdClear.Text = "&Clear";
+			this.cmdClear.UseVisualStyleBackColor = false;
+			this.cmdClear.Click += new System.EventHandler(this.cmdClear_Click);
+			// 
+			// ObjectModelBrowserPopup
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackColor = System.Drawing.SystemColors.Window;
+			this.ClientSize = new System.Drawing.Size(364, 213);
+			this.ControlBox = false;
+			this.Controls.Add(this.cmdClear);
+			this.Controls.Add(this.lv);
+			this.Controls.Add(this.txtSearch);
+			this.Name = "ObjectModelBrowserPopup";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+			this.ResumeLayout(false);
+			this.PerformLayout();
 
         }
 
@@ -110,6 +119,7 @@
         private System.Windows.Forms.ColumnHeader chDescription;
         private System.Windows.Forms.TextBox txtSearch;
         private System.Windows.Forms.Button cmdClear;
+		private System.Windows.Forms.ColumnHeader chAssembly;
 
 
     }
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.cs
index 3194edfa..23e434b2 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Dialogs/ObjectModelBrowserPopup.cs
@@ -125,6 +125,10 @@ namespace UniversalEditor.UserInterface.WindowsForms.Dialogs
 			ListViewItem lvi = new ListViewItem();
 			lvi.Text = dfr.Title;
 			lvi.SubItems.Add(dfr.Description);
+			if (dfr.ObjectModelType != null)
+			{
+				lvi.SubItems.Add(dfr.ObjectModelType.Assembly.Location);
+			}
 			lvi.Tag = dfr;
 			lv.Items.Add(lvi);
 		}