Index: Core/Common/src/Core.Common.Base/Plugin/DataItemInfo.cs
===================================================================
diff -u -r905cfbd0916a140115717f06eb3755d49420ef21 -rb8686fd8e20f2df910d5e291d9dcff0ed587cece
--- Core/Common/src/Core.Common.Base/Plugin/DataItemInfo.cs	(.../DataItemInfo.cs)	(revision 905cfbd0916a140115717f06eb3755d49420ef21)
+++ Core/Common/src/Core.Common.Base/Plugin/DataItemInfo.cs	(.../DataItemInfo.cs)	(revision b8686fd8e20f2df910d5e291d9dcff0ed587cece)
@@ -38,12 +38,12 @@
         public Image Image { get; set; }
 
         /// <summary>
-        /// Gets or set a method for determining whether or not the data item information is relevant for the proposed owner.
+        /// Gets or sets a method for determining whether or not the data item information is relevant for the proposed owner.
         /// </summary>
         public Func<object, bool> AdditionalOwnerCheck { get; set; }
 
         /// <summary>
-        /// Gets or set a function for creating the data.
+        /// Gets or sets a function for creating the data.
         /// The object parameter holds the proposed owner of the data to create.
         /// </summary>
         public Func<object, object> CreateData { get; set; }
@@ -91,12 +91,12 @@
         public Image Image { get; set; }
 
         /// <summary>
-        /// Gets or set a method for determining whether or not the data item information is relevant for the proposed owner.
+        /// Gets or sets a method for determining whether or not the data item information is relevant for the proposed owner.
         /// </summary>
         public Func<object, bool> AdditionalOwnerCheck { get; set; }
 
         /// <summary>
-        /// Gets or set a function for creating the data.
+        /// Gets or sets a function for creating the data.
         /// The object parameter holds the proposed owner of the data to create.
         /// </summary>
         public Func<object, TValue> CreateData { get; set; }
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs
===================================================================
diff -u -r905cfbd0916a140115717f06eb3755d49420ef21 -rb8686fd8e20f2df910d5e291d9dcff0ed587cece
--- Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs	(.../TreeNodeInfo.cs)	(revision 905cfbd0916a140115717f06eb3755d49420ef21)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs	(.../TreeNodeInfo.cs)	(revision b8686fd8e20f2df910d5e291d9dcff0ed587cece)
@@ -13,7 +13,7 @@
         /// </summary>
         public TreeNodeInfo()
         {
-            Text = () => "";
+            Text = tag => "";
         }
 
         /// <summary>
@@ -22,14 +22,16 @@
         public Type TagType { get; set; }
 
         /// <summary>
-        /// Gets or sets a <see cref="Func{TResult}"/> for obtaining the tree node text.
+        /// Gets or sets a function for obtaining the tree node text.
+        /// The <c>object</c> parameter holds the wrapped data of the tree node.
         /// </summary>
-        public Func<string> Text { get; set; }
+        public Func<object, string> Text { get; set; }
 
         /// <summary>
-        /// Gets or sets a <see cref="Func{TResult}"/> for obtaining the tree node image.
+        /// Gets or sets a function for obtaining the tree node image.
+        /// The <c>object</c> parameter holds the wrapped data of the tree node.
         /// </summary>
-        public Func<Image> Image { get; set; }
+        public Func<object, Image> Image { get; set; }
     }
 
     /// <summary>
@@ -43,7 +45,7 @@
         /// </summary>
         public TreeNodeInfo()
         {
-            Text = () => "";
+            Text = tag => "";
         }
 
         /// <summary>
@@ -58,14 +60,16 @@
         }
 
         /// <summary>
-        /// Gets or sets a <see cref="Func{TResult}"/> for obtaining the tree node text.
+        /// Gets or sets a function for obtaining the tree node text.
+        /// The <typeparamref name="TData"/> parameter holds the wrapped data of the tree node.
         /// </summary>
-        public Func<string> Text { get; set; }
+        public Func<TData, string> Text { get; set; }
 
         /// <summary>
-        /// Gets or sets a <see cref="Func{TResult}"/> for obtaining the tree node image.
+        /// Gets or sets a function for obtaining the tree node image.
+        /// The <typeparamref name="TData"/> parameter holds the wrapped data of the tree node.
         /// </summary>
-        public Func<Image> Image { get; set; }
+        public Func<TData, Image> Image { get; set; }
 
         /// <summary>
         /// This operator converts a <see cref="TreeNodeInfo{TData}"/> into a <see cref="TreeNodeInfo"/>.
@@ -77,8 +81,8 @@
             return new TreeNodeInfo
             {
                 TagType = treeNodeInfo.TagType,
-                Text = treeNodeInfo.Text,
-                Image = treeNodeInfo.Image
+                Text = tag => treeNodeInfo.Text((TData) tag),
+                Image = tag => treeNodeInfo.Image((TData) tag)
             };
         }
     }