Index: Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyResolver.cs
===================================================================
diff -u -rd04134ed544a473735b4ca201588c50eb090ea8c -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyResolver.cs	(.../PropertyResolver.cs)	(revision d04134ed544a473735b4ca201588c50eb090ea8c)
+++ Core/Common/src/Core.Common.Gui/Forms/PropertyGridView/PropertyResolver.cs	(.../PropertyResolver.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Gui.Properties;
-using Core.Common.Utils.PropertyBag.Dynamic;
+using Core.Common.Utils.PropertyBag;
 
 namespace Core.Common.Gui.Forms.PropertyGridView
 {
Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -r25019cc752a91361f32968c26d48064ed35a916c -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision 25019cc752a91361f32968c26d48064ed35a916c)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -13,7 +13,7 @@
 using Core.Common.Base.Plugin;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.Forms.PropertyGridView;
-using Core.Common.Utils.PropertyBag.Dynamic;
+using Core.Common.Utils.PropertyBag;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -rfa33f7c078c5d17f92f6a519f147a0a371593944 -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision fa33f7c078c5d17f92f6a519f147a0a371593944)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -114,12 +114,12 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resource.resx</DependentUpon>
     </Compile>
+    <Compile Include="PropertyBag\DynamicPropertyBag.cs" />
+    <Compile Include="PropertyBag\PropertySpecCollection.cs" />
+    <Compile Include="PropertyBag\PropertySpecDescriptor.cs" />
     <Compile Include="SettingsHelper.cs" />
-    <Compile Include="TextDocument.cs" />
-    <Compile Include="PropertyBag\Dynamic\DynamicPropertyBag.cs" />
     <Compile Include="Drawing\ImageExtensions.cs" />
     <Compile Include="MathUtils.cs" />
-    <Compile Include="PropertyBag\PropertyBag.cs" />
     <Compile Include="PropertyBag\PropertySpec.cs" />
     <Compile Include="PropertyBag\PropertySpecEventArgs.cs" />
     <Compile Include="Reflection\TypeUtils.cs" />
@@ -180,7 +180,9 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="PropertyBag\Dynamic\" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Fisheye: Tag e95dbee6ea6b002476a7827a03f6584b779ad594 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/PropertyBag/Dynamic/DynamicPropertyBag.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/PropertyBag/DynamicPropertyBag.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/PropertyBag/DynamicPropertyBag.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/PropertyBag/DynamicPropertyBag.cs	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -0,0 +1,308 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+
+using Core.Common.Utils.Attributes;
+
+namespace Core.Common.Utils.PropertyBag
+{
+    /// <summary>
+    /// Creates a custom type descriptor for an object using reflection as a property bag. Used for Property Grid.
+    /// Additionally it scans the object for any dynamic attributes and processes those, eg checks their condition
+    /// at runtime and if met, adds them as static attribute.
+    /// </summary>
+    public class DynamicPropertyBag : ICustomTypeDescriptor
+    {
+        public DynamicPropertyBag(object propertyObject)
+        {
+            Properties = new PropertySpecCollection();
+            Initialize(propertyObject);
+        }
+
+        /// <summary>
+        /// Gets the collection of properties contained within this PropertyBag.
+        /// </summary>
+        public PropertySpecCollection Properties { get; private set; }
+
+        public object WrappedObject { get; private set; }
+
+        public Type GetContentType()
+        {
+            return WrappedObject.GetType();
+        }
+
+        public override string ToString()
+        {
+            return WrappedObject.ToString();
+        }
+
+        /// <summary>
+        /// Raises the GetValue event.
+        /// </summary>
+        /// <param name="e">A PropertySpecEventArgs that contains the event data.</param>
+        /// <param name="propertySpec"></param>
+        internal void OnGetValue(PropertySpecEventArgs e, PropertySpec propertySpec)
+        {
+            var attributeList = new List<Attribute>();
+            attributeList.AddRange(propertySpec.Attributes.ToList());
+
+            var setToReadOnly = false;
+            EditorAttribute editorAttribute = null;
+            DynamicEditorAttribute dynamicEditorAttribute = null;
+
+            //check all of the attributes: if we find a dynamic one, evaluate it and possibly add/overwrite a static attribute
+            foreach (Attribute customAttribute in propertySpec.Attributes)
+            {
+                if (customAttribute is DynamicReadOnlyAttribute)
+                {
+                    attributeList.RemoveAll(x => x is ReadOnlyAttribute);
+
+                    if (DynamicReadOnlyAttribute.IsDynamicReadOnly(WrappedObject, propertySpec.Name))
+                    {
+                        //condition is true: the dynamic attribute should be applied (as static attribute)
+                        attributeList.Add(new ReadOnlyAttribute(true)); //add static read only attribute
+                        setToReadOnly = true;
+                    }
+                }
+
+                if (customAttribute is DynamicVisibleAttribute)
+                {
+                    attributeList.RemoveAll(x => x is BrowsableAttribute);
+
+                    if (!DynamicVisibleAttribute.IsDynamicVisible(WrappedObject, propertySpec.Name))
+                    {
+                        attributeList.Add(new BrowsableAttribute(false));
+                    }
+                }
+
+                if (customAttribute is EditorAttribute)
+                {
+                    editorAttribute = customAttribute as EditorAttribute;
+                }
+                if (customAttribute is DynamicEditorAttribute)
+                {
+                    dynamicEditorAttribute = customAttribute as DynamicEditorAttribute;
+                }
+            }
+
+            if (setToReadOnly && editorAttribute != null)
+            {
+                // translate EditorAttribute into DynamicEditorAttribute (since the property is readonly)
+                attributeList.RemoveAll(x => x is EditorAttribute);
+                attributeList.Add(new DynamicEditorAttribute(editorAttribute.EditorTypeName, editorAttribute.EditorBaseTypeName));
+            }
+            if (!setToReadOnly && dynamicEditorAttribute != null)
+            {
+                // translate DynamicEditorAttribute into regular EditorAttribute (since the property is NOT readonly)
+                attributeList.RemoveAll(x => x is DynamicEditorAttribute);
+                try
+                {
+                    attributeList.Add(new EditorAttribute(Type.GetType(dynamicEditorAttribute.EditorType, true), Type.GetType(dynamicEditorAttribute.EditorBaseType, true)));
+                }
+                catch (Exception)
+                {
+                    // nothing we can do about it
+                }
+            }
+
+            propertySpec.Attributes = attributeList.ToArray();
+
+            var propertyInfo = WrappedObject.GetType().GetProperty(propertySpec.Name);
+            var value = propertyInfo.GetValue(WrappedObject, null);
+
+            var isNestedPropertiesObject = IsNestedExpandablePropertiesObject(propertyInfo);
+
+            // if nested properties object, wrap in DynamicPropertyBag to provide support for things like DynamicReadOnly
+            e.Value = isNestedPropertiesObject ? new DynamicPropertyBag(value) : value;
+        }
+
+        /// <summary>
+        /// Raises the SetValue event.
+        /// </summary>
+        /// <param name="propertyName"></param>
+        /// <param name="propertyValue"></param>
+        internal void OnSetValue(string propertyName, object propertyValue)
+        {
+            WrappedObject.GetType().GetProperty(propertyName).SetValue(WrappedObject, propertyValue, null);
+        }
+
+        private void Initialize(object propertyObject)
+        {
+            WrappedObject = propertyObject;
+
+            foreach (var propertyInfo in propertyObject.GetType().GetProperties().OrderBy(x => x.MetadataToken).ToArray())
+            {
+                var propertySpec = GetProperySpecForProperty(propertyInfo);
+                Properties.Add(propertySpec);
+            }
+        }
+
+        private static PropertySpec GetProperySpecForProperty(PropertyInfo propertyInfo)
+        {
+            var propertySpec = new PropertySpec(propertyInfo.Name, propertyInfo.PropertyType);
+
+            var attributeList = new List<Attribute>();
+            foreach (object attrib in propertyInfo.GetCustomAttributes(true))
+            {
+                if (attrib is Attribute)
+                {
+                    attributeList.Add(attrib as Attribute);
+                }
+            }
+
+            if (propertyInfo.GetSetMethod() == null)
+            {
+                attributeList.Add(new ReadOnlyAttribute(true));
+            }
+            propertySpec.Attributes = attributeList.ToArray();
+
+            return propertySpec;
+        }
+
+        /// <summary>
+        /// Determines if the property represents nested object properties, by checking for an ExpandableObjectConverter type converter.
+        /// </summary>
+        /// <param name="propertyInfo"></param>
+        /// <returns></returns>
+        private bool IsNestedExpandablePropertiesObject(PropertyInfo propertyInfo)
+        {
+            try
+            {
+                var typeConverterAttributes = propertyInfo.GetCustomAttributes(typeof(TypeConverterAttribute), false);
+                foreach (TypeConverterAttribute typeConverterAttribute in typeConverterAttributes)
+                {
+                    var typeString = typeConverterAttribute.ConverterTypeName;
+                    var type = Type.GetType(typeString);
+                    if (type != null)
+                    {
+                        if (typeof(ExpandableObjectConverter) == type)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                //gulp
+            }
+            return false;
+        }
+
+        #region ICustomTypeDescriptor explicit interface definitions
+
+        #region Implementations delegated to System.ComponentModel.TypeDescriptor
+
+        public AttributeCollection GetAttributes()
+        {
+            return TypeDescriptor.GetAttributes(this, true);
+        }
+
+        public string GetClassName()
+        {
+            return TypeDescriptor.GetClassName(this, true);
+        }
+
+        public string GetComponentName()
+        {
+            return TypeDescriptor.GetComponentName(this, true);
+        }
+
+        public System.ComponentModel.TypeConverter GetConverter()
+        {
+            return TypeDescriptor.GetConverter(this, true);
+        }
+
+        public EventDescriptor GetDefaultEvent()
+        {
+            return TypeDescriptor.GetDefaultEvent(this, true);
+        }
+
+        public object GetEditor(Type editorBaseType)
+        {
+            return TypeDescriptor.GetEditor(this, editorBaseType, true);
+        }
+
+        public EventDescriptorCollection GetEvents()
+        {
+            return TypeDescriptor.GetEvents(this, true);
+        }
+
+        public EventDescriptorCollection GetEvents(Attribute[] attributes)
+        {
+            return TypeDescriptor.GetEvents(this, attributes, true);
+        }
+
+        public PropertyDescriptorCollection GetProperties()
+        {
+            return GetProperties(new Attribute[0]);
+        }
+
+        #endregion
+
+        public PropertyDescriptor GetDefaultProperty()
+        {
+            return Properties.Count > 0 ? new PropertySpecDescriptor(Properties[0], this, Properties[0].Name, null) : null;
+        }
+
+        public PropertyDescriptorCollection GetProperties(Attribute[] attributes)
+        {
+            // Rather than passing this function on to the default TypeDescriptor,
+            // which would return the actual properties of PropertyBag, I construct
+            // a list here that contains property descriptors for the elements of the
+            // Properties list in the bag.
+            var props = new List<PropertySpecDescriptor>();
+            var propsToOrder = new List<Tuple<int, PropertySpecDescriptor>>();
+
+            foreach (PropertySpec property in Properties)
+            {
+                var attrs = new ArrayList();
+
+                // Additionally, append the custom attributes associated with the
+                // PropertySpec, if any.
+                if (property.Attributes != null)
+                {
+                    attrs.AddRange(property.Attributes);
+                }
+
+                Attribute[] attrArray = (Attribute[])attrs.ToArray(typeof(Attribute));
+
+                // Create a new property descriptor for the property item, and add
+                // it to the list.
+                var pd = new PropertySpecDescriptor(property, this, property.Name, attrArray);
+
+                var propertyOrderAttribute = property.Attributes != null ? property.Attributes.OfType<PropertyOrderAttribute>().FirstOrDefault() : null;
+                if (propertyOrderAttribute != null)
+                {
+                    propsToOrder.Add(new Tuple<int, PropertySpecDescriptor>(propertyOrderAttribute.Order, pd));
+                }
+                else
+                {
+                    props.Add(pd);
+                }
+            }
+
+            var orderedProperties = propsToOrder.OrderBy(p => p.Item1).Select(p => p.Item2).ToList();
+
+            // Convert the list of PropertyDescriptors to a collection that the
+            // ICustomTypeDescriptor can use, and return it.
+            var browsableAttribute = attributes.OfType<BrowsableAttribute>().FirstOrDefault();
+
+            var propertySpecDescriptors = (browsableAttribute != null)
+                                              ? orderedProperties.Concat(props).Where(p => p.IsBrowsable == browsableAttribute.Browsable)
+                                              : orderedProperties.Concat(props);
+
+            return new PropertyDescriptorCollection(propertySpecDescriptors.ToArray());
+        }
+
+        public object GetPropertyOwner(PropertyDescriptor pd)
+        {
+            return this;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Fisheye: Tag e95dbee6ea6b002476a7827a03f6584b779ad594 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/PropertyBag/PropertyBag.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/PropertyBag/PropertySpecCollection.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/PropertyBag/PropertySpecCollection.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/PropertyBag/PropertySpecCollection.cs	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -0,0 +1,349 @@
+using System;
+using System.Collections;
+
+namespace Core.Common.Utils.PropertyBag
+{
+    /// <summary>
+    /// Encapsulates a collection of PropertySpec objects.
+    /// </summary>
+    [Serializable]
+    public class PropertySpecCollection : IList
+    {
+        private readonly ArrayList innerArray;
+
+        /// <summary>
+        /// Initializes a new instance of the PropertySpecCollection class.
+        /// </summary>
+        public PropertySpecCollection()
+        {
+            innerArray = new ArrayList();
+        }
+
+        /// <summary>
+        /// Gets or sets the element at the specified index.
+        /// In C#, this property is the indexer for the PropertySpecCollection class.
+        /// </summary>
+        /// <param name="index">The zero-based index of the element to get or set.</param>
+        /// <value>
+        /// The element at the specified index.
+        /// </value>
+        public PropertySpec this[int index]
+        {
+            get
+            {
+                return (PropertySpec) innerArray[index];
+            }
+            set
+            {
+                innerArray[index] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of elements in the PropertySpecCollection.
+        /// </summary>
+        /// <value>
+        /// The number of elements contained in the PropertySpecCollection.
+        /// </value>
+        public int Count
+        {
+            get
+            {
+                return innerArray.Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the PropertySpecCollection has a fixed size.
+        /// </summary>
+        /// <value>
+        /// true if the PropertySpecCollection has a fixed size; otherwise, false.
+        /// </value>
+        public bool IsFixedSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the PropertySpecCollection is read-only.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether access to the collection is synchronized (thread-safe).
+        /// </summary>
+        /// <value>
+        /// true if access to the PropertySpecCollection is synchronized (thread-safe); otherwise, false.
+        /// </value>
+        public bool IsSynchronized
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets an object that can be used to synchronize access to the collection.
+        /// </summary>
+        /// <value>
+        /// An object that can be used to synchronize access to the collection.
+        /// </value>
+        object ICollection.SyncRoot
+        {
+            get
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Adds a PropertySpec to the end of the PropertySpecCollection.
+        /// </summary>
+        /// <param name="value">The PropertySpec to be added to the end of the PropertySpecCollection.</param>
+        /// <returns>The PropertySpecCollection index at which the value has been added.</returns>
+        public int Add(PropertySpec value)
+        {
+            int index = innerArray.Add(value);
+
+            return index;
+        }
+
+        /// <summary>
+        /// Adds the elements of an array of PropertySpec objects to the end of the PropertySpecCollection.
+        /// </summary>
+        /// <param name="array">The PropertySpec array whose elements should be added to the end of the
+        /// PropertySpecCollection.</param>
+        public void AddRange(PropertySpec[] array)
+        {
+            innerArray.AddRange(array);
+        }
+
+        /// <summary>
+        /// Determines whether a PropertySpec is in the PropertySpecCollection.
+        /// </summary>
+        /// <param name="item">The PropertySpec to locate in the PropertySpecCollection. The element to locate
+        /// can be a null reference (Nothing in Visual Basic).</param>
+        /// <returns>true if item is found in the PropertySpecCollection; otherwise, false.</returns>
+        public bool Contains(PropertySpec item)
+        {
+            return innerArray.Contains(item);
+        }
+
+        /// <summary>
+        /// Determines whether a PropertySpec with the specified name is in the PropertySpecCollection.
+        /// </summary>
+        /// <param name="name">The name of the PropertySpec to locate in the PropertySpecCollection.</param>
+        /// <returns>true if item is found in the PropertySpecCollection; otherwise, false.</returns>
+        public bool Contains(string name)
+        {
+            foreach (PropertySpec spec in innerArray)
+            {
+                if (spec.Name == name)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// Copies the entire PropertySpecCollection to a compatible one-dimensional Array, starting at the
+        /// beginning of the target array.
+        /// </summary>
+        /// <param name="array">The one-dimensional Array that is the destination of the elements copied
+        /// fromPropertySpecCollection. The Array must have zero-based indexing.</param>
+        public void CopyTo(PropertySpec[] array)
+        {
+            innerArray.CopyTo(array);
+        }
+
+        /// <summary>
+        /// Copies the PropertySpecCollection or a portion of it to a one-dimensional array.
+        /// </summary>
+        /// <param name="array">The one-dimensional Array that is the destination of the elements copied
+        /// from the collection.</param>
+        /// <param name="index">The zero-based index in array at which copying begins.</param>
+        public void CopyTo(PropertySpec[] array, int index)
+        {
+            innerArray.CopyTo(array, index);
+        }
+
+        /// <summary>
+        /// Searches for the specified PropertySpec and returns the zero-based index of the first
+        /// occurrence within the entire PropertySpecCollection.
+        /// </summary>
+        /// <param name="value">The PropertySpec to locate in the PropertySpecCollection.</param>
+        /// <returns>The zero-based index of the first occurrence of value within the entire PropertySpecCollection,
+        /// if found; otherwise, -1.</returns>
+        public int IndexOf(PropertySpec value)
+        {
+            return innerArray.IndexOf(value);
+        }
+
+        /// <summary>
+        /// Searches for the PropertySpec with the specified name and returns the zero-based index of
+        /// the first occurrence within the entire PropertySpecCollection.
+        /// </summary>
+        /// <param name="name">The name of the PropertySpec to locate in the PropertySpecCollection.</param>
+        /// <returns>The zero-based index of the first occurrence of value within the entire PropertySpecCollection,
+        /// if found; otherwise, -1.</returns>
+        public int IndexOf(string name)
+        {
+            int i = 0;
+
+            foreach (PropertySpec spec in innerArray)
+            {
+                if (spec.Name == name)
+                {
+                    return i;
+                }
+
+                i++;
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Inserts a PropertySpec object into the PropertySpecCollection at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index at which value should be inserted.</param>
+        /// <param name="value">The PropertySpec to insert.</param>
+        public void Insert(int index, PropertySpec value)
+        {
+            innerArray.Insert(index, value);
+        }
+
+        /// <summary>
+        /// Removes the first occurrence of a specific object from the PropertySpecCollection.
+        /// </summary>
+        /// <param name="obj">The PropertySpec to remove from the PropertySpecCollection.</param>
+        public void Remove(PropertySpec obj)
+        {
+            innerArray.Remove(obj);
+        }
+
+        /// <summary>
+        /// Removes the property with the specified name from the PropertySpecCollection.
+        /// </summary>
+        /// <param name="name">The name of the PropertySpec to remove from the PropertySpecCollection.</param>
+        public void Remove(string name)
+        {
+            int index = IndexOf(name);
+            RemoveAt(index);
+        }
+
+        /// <summary>
+        /// Copies the elements of the PropertySpecCollection to a new PropertySpec array.
+        /// </summary>
+        /// <returns>A PropertySpec array containing copies of the elements of the PropertySpecCollection.</returns>
+        public PropertySpec[] ToArray()
+        {
+            return (PropertySpec[]) innerArray.ToArray(typeof(PropertySpec));
+        }
+
+        /// <summary>
+        /// Removes all elements from the PropertySpecCollection.
+        /// </summary>
+        public void Clear()
+        {
+            innerArray.Clear();
+        }
+
+        /// <summary>
+        /// Returns an enumerator that can iterate through the PropertySpecCollection.
+        /// </summary>
+        /// <returns>An IEnumerator for the entire PropertySpecCollection.</returns>
+        public IEnumerator GetEnumerator()
+        {
+            return innerArray.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Removes the object at the specified index of the PropertySpecCollection.
+        /// </summary>
+        /// <param name="index">The zero-based index of the element to remove.</param>
+        public void RemoveAt(int index)
+        {
+            innerArray.RemoveAt(index);
+        }
+
+        #region Explicit interface implementations for ICollection and IList
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        void ICollection.CopyTo(Array array, int index)
+        {
+            CopyTo((PropertySpec[]) array, index);
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        int IList.Add(object value)
+        {
+            return Add((PropertySpec) value);
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        bool IList.Contains(object obj)
+        {
+            return Contains((PropertySpec) obj);
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        object IList.this[int index]
+        {
+            get
+            {
+                return ((PropertySpecCollection) this)[index];
+            }
+            set
+            {
+                ((PropertySpecCollection) this)[index] = (PropertySpec) value;
+            }
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        int IList.IndexOf(object obj)
+        {
+            return IndexOf((PropertySpec) obj);
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        void IList.Insert(int index, object value)
+        {
+            Insert(index, (PropertySpec) value);
+        }
+
+        /// <summary>
+        /// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.
+        /// </summary>
+        void IList.Remove(object value)
+        {
+            Remove((PropertySpec) value);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Utils/PropertyBag/PropertySpecDescriptor.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Utils/PropertyBag/PropertySpecDescriptor.cs	(revision 0)
+++ Core/Common/src/Core.Common.Utils/PropertyBag/PropertySpecDescriptor.cs	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -0,0 +1,91 @@
+using System;
+using System.ComponentModel;
+
+namespace Core.Common.Utils.PropertyBag
+{
+    public class PropertySpecDescriptor : PropertyDescriptor
+    {
+        private readonly DynamicPropertyBag bag;
+        private readonly PropertySpec item;
+
+        public PropertySpecDescriptor(PropertySpec item, DynamicPropertyBag bag, string name, Attribute[] attrs)
+            :
+                base(name, attrs)
+        {
+            this.bag = bag;
+            this.item = item;
+        }
+
+        public override Type ComponentType
+        {
+            get
+            {
+                return item.GetType();
+            }
+        }
+
+        public override bool IsReadOnly
+        {
+            get
+            {
+                return (Attributes.Matches(ReadOnlyAttribute.Yes));
+            }
+        }
+
+        public override bool IsBrowsable
+        {
+            get
+            {
+                ReEvaluateAttributes();
+                return base.IsBrowsable;
+            }
+        }
+
+        public override Type PropertyType
+        {
+            get
+            {
+                return Type.GetType(item.TypeName);
+            }
+        }
+
+        public override bool CanResetValue(object component)
+        {
+            return false;
+        }
+
+        public override object GetValue(object component)
+        {
+            return ReEvaluateAttributes().Value;
+        }
+
+        public override void ResetValue(object component)
+        {
+
+        }
+
+        public override void SetValue(object component, object value)
+        {
+            // Have the property bag raise an event to set the current value
+            // of the property.
+
+            PropertySpecEventArgs e = new PropertySpecEventArgs(item, value);
+            bag.OnSetValue(e.Property.Name, e.Value);
+        }
+
+        public override bool ShouldSerializeValue(object component)
+        {
+            return false;
+        }
+
+        private PropertySpecEventArgs ReEvaluateAttributes()
+        {
+            // Have the property bag raise an event to get the current value
+            // of the property and evaluate the dynamic attributes
+            var e = new PropertySpecEventArgs(item, null);
+            bag.OnGetValue(e, e.Property);
+            AttributeArray = e.Property.Attributes;
+            return e;
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag e95dbee6ea6b002476a7827a03f6584b779ad594 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/TextDocument.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs
===================================================================
diff -u -r8d069bd17ce1b0f7ec017385f9f4e5fd84ed1f6f -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs	(.../PropertyResolverTest.cs)	(revision 8d069bd17ce1b0f7ec017385f9f4e5fd84ed1f6f)
+++ Core/Common/test/Core.Common.Test/Gui/Forms/PropertyGridView/PropertyResolverTest.cs	(.../PropertyResolverTest.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -3,7 +3,8 @@
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.PropertyGridView;
 using Core.Common.Gui.Properties;
-using Core.Common.Utils.PropertyBag.Dynamic;
+using Core.Common.Utils.PropertyBag;
+
 using NUnit.Framework;
 
 namespace Core.Common.Test.Gui.Forms.PropertyGridView
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -r59928c876bc0495bfdb24eed826cc2abafcf18fb -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 59928c876bc0495bfdb24eed826cc2abafcf18fb)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -104,7 +104,6 @@
     <Compile Include="TestHelperTests.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="TextDocumentTest.cs" />
     <Compile Include="UrlTest.cs" />
     <Compile Include="Validation\ValidationReportTest.cs" />
   </ItemGroup>
Index: Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs
===================================================================
diff -u -rfa33f7c078c5d17f92f6a519f147a0a371593944 -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision fa33f7c078c5d17f92f6a519f147a0a371593944)
+++ Core/Common/test/Core.Common.Utils.Test/PropertyBag/DynamicPropertyBagTest.cs	(.../DynamicPropertyBagTest.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -5,7 +5,7 @@
 
 using Core.Common.Utils.Attributes;
 using Core.Common.Utils.PropertyBag;
-using Core.Common.Utils.PropertyBag.Dynamic;
+
 using NUnit.Framework;
 using CategoryComponentModelAttribute = System.ComponentModel.CategoryAttribute;
 
Fisheye: Tag e95dbee6ea6b002476a7827a03f6584b779ad594 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/TextDocumentTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/CoordinateSystemTypeEditor.cs
===================================================================
diff -u -r37b92ac1ba7a5d381aedd8e287443450e0c2d7aa -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/CoordinateSystemTypeEditor.cs	(.../CoordinateSystemTypeEditor.cs)	(revision 37b92ac1ba7a5d381aedd8e287443450e0c2d7aa)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/GridProperties/CoordinateSystemTypeEditor.cs	(.../CoordinateSystemTypeEditor.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -3,7 +3,8 @@
 using System.ComponentModel;
 using System.Drawing.Design;
 using System.Windows.Forms;
-using Core.Common.Utils.PropertyBag.Dynamic;
+
+using Core.Common.Utils.PropertyBag;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.SharpMap.Map;
 using Core.GIS.SharpMap.UI.Forms;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs
===================================================================
diff -u -r23773f2915c16d8f4d86b6bba06769ffc8e4032d -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs	(.../DesignVariableTypeConverter.cs)	(revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/TypeConverters/DesignVariableTypeConverter.cs	(.../DesignVariableTypeConverter.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Core.Common.Base;
-using Core.Common.Utils.PropertyBag.Dynamic;
+using Core.Common.Utils.PropertyBag;
 
 using Ringtoets.Piping.Data.Probabilistics;
 using Ringtoets.Piping.Forms.PresentationObjects;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSelectionEditor.cs
===================================================================
diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSelectionEditor.cs	(.../PipingInputContextSelectionEditor.cs)	(revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/UITypeEditors/PipingInputContextSelectionEditor.cs	(.../PipingInputContextSelectionEditor.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -5,7 +5,9 @@
 using System.Linq;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
-using Core.Common.Utils.PropertyBag.Dynamic;
+
+using Core.Common.Utils.PropertyBag;
+
 using Ringtoets.Piping.Forms.PropertyClasses;
 
 namespace Ringtoets.Piping.Forms.UITypeEditors
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -r636f3e171b2d423e6716bed09cb241de68ea8a6a -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs	(.../LognormalDistributionDesignVariableTypeConverterTest.cs)	(revision 636f3e171b2d423e6716bed09cb241de68ea8a6a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs	(.../LognormalDistributionDesignVariableTypeConverterTest.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using Core.Common.Base;
-using Core.Common.Utils.PropertyBag.Dynamic;
+using Core.Common.Utils.PropertyBag;
 
 using NUnit.Framework;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs
===================================================================
diff -u -r636f3e171b2d423e6716bed09cb241de68ea8a6a -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs	(.../NormalDistributionDesignVariableTypeConverterTest.cs)	(revision 636f3e171b2d423e6716bed09cb241de68ea8a6a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs	(.../NormalDistributionDesignVariableTypeConverterTest.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using Core.Common.Base;
-using Core.Common.Utils.PropertyBag.Dynamic;
+using Core.Common.Utils.PropertyBag;
 
 using NUnit.Framework;
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs
===================================================================
diff -u -rfb32e3411873a7b4c567792b9f335eba462e2702 -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs	(.../PipingInputContextSoilProfileSelectionEditorTest.cs)	(revision fb32e3411873a7b4c567792b9f335eba462e2702)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSoilProfileSelectionEditorTest.cs	(.../PipingInputContextSoilProfileSelectionEditorTest.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -1,7 +1,9 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms.Design;
-using Core.Common.Utils.PropertyBag.Dynamic;
+
+using Core.Common.Utils.PropertyBag;
+
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Calculation.TestUtil;
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs
===================================================================
diff -u -r79e69f1b4b303862f3572d0f6cb60acf63a957e9 -re95dbee6ea6b002476a7827a03f6584b779ad594
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs	(.../PipingInputContextSurfaceLineSelectionEditorTest.cs)	(revision 79e69f1b4b303862f3572d0f6cb60acf63a957e9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs	(.../PipingInputContextSurfaceLineSelectionEditorTest.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
@@ -1,7 +1,9 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Forms.Design;
-using Core.Common.Utils.PropertyBag.Dynamic;
+
+using Core.Common.Utils.PropertyBag;
+
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Piping.Data;