diff --git a/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj b/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
index 3ee0b4817..7ffd4e7d5 100644
--- a/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
+++ b/CDP4Common.NetCore.Tests/CDP4Common.NetCore.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4Common-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4Common-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4Common.NetCore.Tests/Helpers/NestedElementTreeGeneratorTestFixtre.cs b/CDP4Common.NetCore.Tests/Helpers/NestedElementTreeGeneratorTestFixtre.cs
new file mode 100644
index 000000000..d2b29a0bc
--- /dev/null
+++ b/CDP4Common.NetCore.Tests/Helpers/NestedElementTreeGeneratorTestFixtre.cs
@@ -0,0 +1,152 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NestedElementTreeGeneratorTestFixtre.cs" company="RHEA System S.A.">
+//   Copyright (c) 2018 RHEA System S.A.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace CDP4Common.Tests.Helpers
+{
+    using System;
+    using System.Collections.Concurrent;
+    using System.Linq;
+
+    using CDP4Common.CommonData;
+    using CDP4Common.EngineeringModelData;
+    using CDP4Common.Helpers;
+    using CDP4Common.SiteDirectoryData;
+    using NUnit.Framework;
+
+    /// <summary>
+    /// Suite of tests for the <see cref="NestedElementTreeGenerator"/> class.
+    /// </summary>
+    [TestFixture]
+    public class NestedElementTreeGeneratorTestFixtre
+    {
+        private NestedElementTreeGenerator nestedElementTreeGenerator;
+        private Uri uri;
+        private ConcurrentDictionary<Tuple<Guid, Guid?>, Lazy<Thing>> cache;
+        private Iteration iteration;
+        private DomainOfExpertise domainOfExpertise;
+
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.nestedElementTreeGenerator = new NestedElementTreeGenerator();
+
+            this.uri = new Uri("http://www.rheagroup.com");
+            this.cache = new ConcurrentDictionary<Tuple<Guid, Guid?>, Lazy<Thing>>();
+
+            this.domainOfExpertise = new DomainOfExpertise(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "SYS",
+                Name = "System"
+            };
+
+            this.iteration = new Iteration(Guid.NewGuid(), this.cache, this.uri);
+
+            var option_A = new Option(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "OPT_A",
+                Name = "Option A"
+            };
+            this.iteration.Option.Add(option_A);
+            this.iteration.DefaultOption = option_A;
+
+            var option_B = new Option(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "OPT_B",
+                Name = "Option B"
+            };
+            this.iteration.Option.Add(option_B);
+
+            var satellite = new ElementDefinition(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "Sat",
+                Name = "Satellite"
+            };
+            this.iteration.Element.Add(satellite);
+            this.iteration.TopElement = satellite;
+
+            var battery = new ElementDefinition(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "Bat",
+                Name = "Battery"
+            };
+            this.iteration.Element.Add(battery);
+
+            var battery_a = new ElementUsage(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ElementDefinition = battery,
+                ShortName = "bat_a",
+                Name = "battery a"
+            };
+            satellite.ContainedElement.Add(battery_a);
+
+            var battery_b = new ElementUsage(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ElementDefinition = battery,
+                ShortName = "bat_b",
+                Name = "battery b"
+            };
+            battery_b.ExcludeOption.Add(option_A);
+
+            satellite.ContainedElement.Add(battery_b);
+        }
+
+        [Test]
+        public void Verify_that_null_arguments_throws_exception()
+        {
+            Assert.Throws<ArgumentNullException>(() => this.nestedElementTreeGenerator.Generate(null, null));
+
+            var option = this.iteration.Option.First();
+            Assert.Throws<ArgumentNullException>(() => this.nestedElementTreeGenerator.Generate(option, null));
+        }
+
+        [Test]
+        public void Verify_that_excluded_usage_option_a_does_not_get_generated_as_nested_element()
+        {
+            var option = this.iteration.Option.Single(x => x.ShortName == "OPT_A");
+
+            var nestedElements = this.nestedElementTreeGenerator.Generate(option, this.domainOfExpertise);
+
+            foreach (var nestedElement in nestedElements)
+            {
+                Console.WriteLine(nestedElement.ShortName);
+            }
+
+            Assert.AreEqual(2, nestedElements.Count());
+        }
+
+        [Test]
+        public void Verify_that_excluded_usage_option_a_does_not_get_generated_as_nested_element_if_option_is_a_cloned_object()
+        {
+            var option = this.iteration.Option.Single(x => x.ShortName == "OPT_A");
+            var optionClone = option.Clone(false);
+
+            var nestedElements = this.nestedElementTreeGenerator.Generate(optionClone, this.domainOfExpertise);
+
+            foreach (var nestedElement in nestedElements)
+            {
+                Console.WriteLine(nestedElement.ShortName);
+            }
+
+            Assert.AreEqual(2, nestedElements.Count());
+        }
+
+        [Test]
+        public void Verify_that_excluded_usage_from_a_In_option_b_get_generated_as_nested_element()
+        {
+            var option = this.iteration.Option.Single(x => x.ShortName == "OPT_B");
+
+            var nestedElements = this.nestedElementTreeGenerator.Generate(option, this.domainOfExpertise);
+
+            foreach (var nestedElement in nestedElements)
+            {
+                Console.WriteLine(nestedElement.ShortName);
+            }
+
+            Assert.AreEqual(3, nestedElements.Count());
+        }
+    }
+}
\ No newline at end of file
diff --git a/CDP4Common.Tests/CDP4Common.Tests.csproj b/CDP4Common.Tests/CDP4Common.Tests.csproj
index a7ff585ea..dc33382d1 100644
--- a/CDP4Common.Tests/CDP4Common.Tests.csproj
+++ b/CDP4Common.Tests/CDP4Common.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4Common-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4Common-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4Common.Tests/Helpers/NestedElementTreeGeneratorTestFixtre.cs b/CDP4Common.Tests/Helpers/NestedElementTreeGeneratorTestFixtre.cs
new file mode 100644
index 000000000..f1570d942
--- /dev/null
+++ b/CDP4Common.Tests/Helpers/NestedElementTreeGeneratorTestFixtre.cs
@@ -0,0 +1,152 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NestedElementTreeGeneratorTestFixtre.cs" company="RHEA System S.A.">
+//   Copyright (c) 2018 RHEA System S.A.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace CDP4Common.Tests.Helpers
+{
+    using System;
+    using System.Collections.Concurrent;
+    using System.Linq;
+
+    using CDP4Common.CommonData;
+    using CDP4Common.EngineeringModelData;
+    using CDP4Common.Helpers;
+    using CDP4Common.SiteDirectoryData;
+    using NUnit.Framework;
+
+    /// <summary>
+    /// Suite of tests for the <see cref="NestedElementTreeGenerator"/> class.
+    /// </summary>
+    [TestFixture]
+    public class NestedElementTreeGeneratorTestFixtre
+    {
+        private NestedElementTreeGenerator nestedElementTreeGenerator;
+        private Uri uri;
+        private ConcurrentDictionary<Tuple<Guid, Guid?>, Lazy<Thing>> cache;
+        private Iteration iteration;
+        private DomainOfExpertise domainOfExpertise;
+
+
+        [SetUp]
+        public void SetUp()
+        {
+            this.nestedElementTreeGenerator = new NestedElementTreeGenerator();
+            
+            this.uri = new Uri("http://www.rheagroup.com");
+            this.cache = new ConcurrentDictionary<Tuple<Guid, Guid?>, Lazy<Thing>>();
+
+            this.domainOfExpertise = new DomainOfExpertise(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "SYS",
+                Name = "System"
+            };
+            
+            this.iteration = new Iteration(Guid.NewGuid(), this.cache, this.uri);
+
+            var option_A = new Option(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "OPT_A",
+                Name = "Option A"
+            };
+            this.iteration.Option.Add(option_A);
+            this.iteration.DefaultOption = option_A;
+
+            var option_B = new Option(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "OPT_B",
+                Name = "Option B"
+            };
+            this.iteration.Option.Add(option_B);
+
+            var satellite = new ElementDefinition(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "Sat",
+                Name = "Satellite"
+            };
+            this.iteration.Element.Add(satellite);
+            this.iteration.TopElement = satellite;
+
+            var battery = new ElementDefinition(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ShortName = "Bat",
+                Name = "Battery"
+            };
+            this.iteration.Element.Add(battery);
+
+            var battery_a = new ElementUsage(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ElementDefinition = battery,
+                ShortName = "bat_a",
+                Name = "battery a"
+            };
+            satellite.ContainedElement.Add(battery_a);
+            
+            var battery_b = new ElementUsage(Guid.NewGuid(), this.cache, this.uri)
+            {
+                ElementDefinition = battery,
+                ShortName = "bat_b",
+                Name = "battery b"                
+            };
+            battery_b.ExcludeOption.Add(option_A);
+
+            satellite.ContainedElement.Add(battery_b);
+        }
+
+        [Test]
+        public void Verify_that_null_arguments_throws_exception()
+        {
+            Assert.Throws<ArgumentNullException>(() => this.nestedElementTreeGenerator.Generate(null, null));
+
+            var option = this.iteration.Option.First();
+            Assert.Throws<ArgumentNullException>(() => this.nestedElementTreeGenerator.Generate(option, null));
+        }
+
+        [Test]
+        public void Verify_that_excluded_usage_option_a_does_not_get_generated_as_nested_element()
+        {
+            var option = this.iteration.Option.Single(x => x.ShortName == "OPT_A");
+            
+            var nestedElements = this.nestedElementTreeGenerator.Generate(option, this.domainOfExpertise);
+
+            foreach (var nestedElement in nestedElements)
+            {
+                Console.WriteLine(nestedElement.ShortName);
+            }
+
+            Assert.AreEqual(2, nestedElements.Count());
+        }
+
+        [Test]
+        public void Verify_that_excluded_usage_option_a_does_not_get_generated_as_nested_element_if_option_is_a_cloned_object()
+        {
+            var option = this.iteration.Option.Single(x => x.ShortName == "OPT_A");
+            var optionClone = option.Clone(false);
+
+            var nestedElements = this.nestedElementTreeGenerator.Generate(optionClone, this.domainOfExpertise);
+
+            foreach (var nestedElement in nestedElements)
+            {
+                Console.WriteLine(nestedElement.ShortName);
+            }
+
+            Assert.AreEqual(2, nestedElements.Count());
+        }
+
+        [Test]
+        public void Verify_that_excluded_usage_from_a_In_option_b_get_generated_as_nested_element()
+        {
+            var option = this.iteration.Option.Single(x => x.ShortName == "OPT_B");
+
+            var nestedElements = this.nestedElementTreeGenerator.Generate(option, this.domainOfExpertise);
+
+            foreach (var nestedElement in nestedElements)
+            {
+                Console.WriteLine(nestedElement.ShortName);
+            }
+
+            Assert.AreEqual(3, nestedElements.Count());
+        }
+    }
+}
\ No newline at end of file
diff --git a/CDP4Common/CDP4Common.csproj b/CDP4Common/CDP4Common.csproj
index 237973b8a..69c5e7e78 100644
--- a/CDP4Common/CDP4Common.csproj
+++ b/CDP4Common/CDP4Common.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard1.6;netstandard2.0</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4Common Community Edition</Title>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>CDP4 Common Class Library that contains DTOs, POCOs</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron, Patxi</Authors>
@@ -16,7 +16,7 @@
     <PackageTags>CDP CDP4 ECSS-E-TM-10-25</PackageTags>
     <PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
     <Configurations>Debug;Release</Configurations>
-    <PackageReleaseNotes>[Add] InvalidOperationException to GetTopContainerRoute() when PartialRoutes is empty</PackageReleaseNotes>
+    <PackageReleaseNotes>[Refactor] NestedElementTreeGenerator to compare options based on unique identifier</PackageReleaseNotes>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/CDP4Common/Helpers/NestedElementTreeGenerator.cs b/CDP4Common/Helpers/NestedElementTreeGenerator.cs
index 340b16752..41c530f59 100644
--- a/CDP4Common/Helpers/NestedElementTreeGenerator.cs
+++ b/CDP4Common/Helpers/NestedElementTreeGenerator.cs
@@ -1,476 +1,486 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NestedElementTreeGenerator.cs" company="RHEA System  S.A.">
-//   Copyright (c) 2017 RHEA System S.A.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace CDP4Common.Helpers
-{
-    using System;
-    using System.Collections.Generic;   
-    using System.Linq;    
-    using CDP4Common.EngineeringModelData;
-    using CDP4Common.SiteDirectoryData;
-    
-    /// <summary>
-    /// The purpose of the <see cref="NestedElementTreeGenerator"/> class is to generate the <see cref="NestedElement"/>s
-    /// and <see cref="NestedParameter"/>s for an <see cref="Option"/> where the <see cref="NestedParameter"/>s
-    /// are owned by a specific <see cref="DomainOfExpertise"/>
-    /// </summary>
-    /// <remarks>
-    /// The <see cref="NestedParameter"/>s represent the owned <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s,
-    /// and <see cref="ParameterSubscription"/>s. Each <see cref="ParameterTypeComponent"/> of a <see cref="CompoundParameterType"/> is 
-    /// represented by a unique <see cref="NestedParameter"/>.
-    /// </remarks>
-    public class NestedElementTreeGenerator
-    {
-        /// <summary>
-        /// Generates the <see cref="NestedElement"/>s and <see cref="NestedParameter"/>s for the specified <see cref="Option"/>
-        /// </summary>
-        /// <param name="option">
-        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree needs to be generated.
-        /// </param>
-        /// <param name="domainOfExpertise">
-        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
-        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
-        /// </param>
-        /// <returns>
-        /// An <see cref="IEnumerable{NestedElement}"/> that contains the generated <see cref="NestedElement"/>s filtered based on the provided <see cref="Option"/>
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// thrown when the <paramref name="domainOfExpertise"/> is null
-        /// thrown when the <paramref name="option"/> is null
-        /// </exception>
-        public IEnumerable<NestedElement> Generate(Option option, DomainOfExpertise domainOfExpertise)
-        {
-            if (option == null)
-            {
-                throw new ArgumentNullException("option", "The option may not be null");
-            }
-
-            if (domainOfExpertise == null)
-            {
-                throw new ArgumentNullException("domainOfExpertise", "The domainOfExpertise may not be null");
-            }
-
-            var iteration = (Iteration)option.Container;
-            var rootElement = iteration.TopElement;
-            
-            if (rootElement == null)
-            {
-                throw new NestedElementTreeException(string.Format("The container Iteration of Option {0} does not have a TopElement specified", option.ShortName));
-            }
-
-            var createNestedElements = this.GenerateNestedElements(option, domainOfExpertise, rootElement);
-            return createNestedElements;
-        }
-
-        /// <summary>
-        /// Generates the <see cref="NestedElement"/>s starting at the <paramref name="rootElement"/>
-        /// </summary>
-        /// <param name="option">
-        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. When the <see cref="Option"/>
-        /// is null then none of the <see cref="ElementUsage"/>s are filtered.
-        /// </param>
-        /// <param name="domainOfExpertise">
-        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
-        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
-        /// </param>
-        /// <param name="rootElement">
-        /// The <see cref="ElementDefinition"/> that serves as the root of the generated <see cref="NestedElement"/> tree.
-        /// </param>
-        /// <returns>
-        /// An <see cref="IEnumerable{NestedElement}"/> that contains the generated <see cref="NestedElement"/>s
-        /// </returns>
-        /// <exception cref="ArgumentNullException">
-        /// thrown when the <paramref name="domainOfExpertise"/> is null
-        /// thrown when the <paramref name="option"/> is null
-        /// thrown when the <paramref name="rootElement"/> is null
-        /// </exception>
-        public IEnumerable<NestedElement> GenerateNestedElements(Option option, DomainOfExpertise domainOfExpertise, ElementDefinition rootElement)
-        {
-            if (option == null)
-            {
-                throw new ArgumentNullException("option", "The option may not be null");
-            }
-
-            if (domainOfExpertise == null)
-            {
-                throw new ArgumentNullException("domainOfExpertise", "The domainOfExpertise may not be null");
-            }
-
-            if (rootElement == null)
-            {
-                throw new ArgumentNullException("rootElement", "The rootElement may not be null");
-            }
-
-            var nestedElements = new List<NestedElement>();
-            
-            var rootNestedElement = this.CreateNestedElementAndNestedParametersForRootElement(rootElement, domainOfExpertise, option);            
-            nestedElements.Add(rootNestedElement);
-            
-            var elementUsages = new List<ElementUsage>();
-            var recursedNestedElements = this.RecursivelyCreateNestedElements(rootElement, rootElement, domainOfExpertise, elementUsages, option);
-            nestedElements.AddRange(recursedNestedElements);
-
-            return nestedElements;
-        }
-
-        /// <summary>
-        /// Recursively Create <see cref="NestedElement"/>s
-        /// </summary>
-        /// <param name="elementDefinition">
-        /// The <see cref="ElementDefinition"/> that contains <see cref="ElementUsage"/>s that
-        /// </param>
-        /// <param name="rootElement">
-        /// The <see cref="ElementDefinition"/> that is the root of the <see cref="NestedElement"/> tree.
-        /// </param>
-        /// <param name="domainOfExpertise">
-        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
-        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
-        /// </param>
-        /// <param name="elementUsages">
-        /// A <see cref="List{ElementUsage}"/> that contains the <see cref="ElementUsage"/> that define the containment tree
-        /// for the <see cref="NestedElement"/>s at the level of the <paramref name="elementDefinition"/>.
-        /// </param>
-        /// <param name="option">
-        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. When the <see cref="Option"/>
-        /// is null then none of the <see cref="ElementUsage"/>s are filtered.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IEnumerable{NestedElement}"/> that have been created.
-        /// </returns>
-        private IEnumerable<NestedElement> RecursivelyCreateNestedElements(ElementDefinition elementDefinition, ElementDefinition rootElement, DomainOfExpertise domainOfExpertise, List<ElementUsage> elementUsages, Option option)
-        {
-            var cache = elementDefinition.Cache;
-            var uri = elementDefinition.IDalUri;
-
-            foreach (var elementUsage in elementDefinition.ContainedElement)
-            {
-                if (elementUsage.ExcludeOption.Contains(option))
-                {
-                    continue;
-                }
-
-                var nestedElement = new NestedElement(Guid.NewGuid(), cache, uri)
-                                        {
-                                            RootElement = rootElement,
-                                            IsVolatile = true
-                                        };
-                option.NestedElement.Add(nestedElement);
-
-                var nestedParameters = this.CreateNestedParameters(elementUsage, domainOfExpertise, option);
-                foreach (var nestedParameter in nestedParameters)
-                {
-                    nestedElement.NestedParameter.Add(nestedParameter);
-                }
-                
-                var containmentUsages = new List<ElementUsage>();
-                foreach (var usage in elementUsages)
-                {
-                    nestedElement.ElementUsage.Add(usage);
-                    containmentUsages.Add(usage);
-                }
-
-                nestedElement.ElementUsage.Add(elementUsage);               
-                containmentUsages.Add(elementUsage);
-
-                var referencedElementDefinition = elementUsage.ElementDefinition;
-
-                var nestedElements = this.RecursivelyCreateNestedElements(referencedElementDefinition, rootElement, domainOfExpertise, containmentUsages, option);
-                foreach (var element in nestedElements)
-                {
-                    yield return element;
-                }
-
-                yield return nestedElement;
-            }
-        }
-
-        /// <summary>
-        /// Creates The <see cref="NestedElement"/> and contained <see cref="NestedParameter"/> that represents the <paramref name="rootElement"/>
-        /// </summary>
-        /// <param name="rootElement">
-        /// The <see cref="ElementDefinition"/> that is the root of the <see cref="NestedElement"/> tree.
-        /// </param>
-        /// <param name="domainOfExpertise">
-        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
-        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
-        /// </param>
-        /// <param name="option">
-        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. When the <see cref="Option"/>
-        /// is null then none of the <see cref="ElementUsage"/>s are filtered.
-        /// </param>
-        /// <returns>
-        /// The <see cref="IEnumerable{NestedElement}"/> that have been created.
-        /// </returns>
-        private NestedElement CreateNestedElementAndNestedParametersForRootElement(ElementDefinition rootElement, DomainOfExpertise domainOfExpertise, Option option)
-        {
-            var nestedElement = new NestedElement(Guid.NewGuid(), rootElement.Cache, rootElement.IDalUri)
-            {
-                RootElement = rootElement,
-                IsVolatile = true,
-                IsRootElement = true
-            };
-            option.NestedElement.Add(nestedElement);
-
-            foreach (var parameter in rootElement.Parameter)
-            {
-                var compoundParameterType = parameter.ParameterType as CompoundParameterType;
-
-                if (parameter.Owner == domainOfExpertise)
-                {
-                    var valueSets = parameter.IsOptionDependent ? parameter.ValueSet.Where(vs => vs.ActualOption == option).ToList() : parameter.ValueSet;
-
-                    foreach (var parameterValueSet in valueSets)
-                    {
-                        if (compoundParameterType == null)
-                        {
-                            var nestedParameter = this.CreatedNestedParameter(parameter, null, parameterValueSet);
-                            nestedElement.NestedParameter.Add(nestedParameter);
-                        }
-                        else
-                        {
-                            foreach (var component in compoundParameterType.Component)
-                            {
-                                var comp = (ParameterTypeComponent)component;
-                                var nestedParameter = this.CreatedNestedParameter(parameter, comp, parameterValueSet);
-                                nestedElement.NestedParameter.Add(nestedParameter);
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    var subscription = parameter.ParameterSubscription.SingleOrDefault(ps => ps.Owner == domainOfExpertise);
-                    if (subscription != null)
-                    {
-                        var nestedParameters = this.CreatedNestedParameters(subscription, option, compoundParameterType);
-                        foreach (var nestedParameter in nestedParameters)
-                        {
-                            nestedElement.NestedParameter.Add(nestedParameter);
-                        }
-                    }
-                }
-            }
-
-            return nestedElement;
-        }
-
-        /// <summary>
-        /// Creates <see cref="NestedParameter"/>s based on the <see cref="Parameter"/> that are contained by the <see cref="ElementDefinition"/>
-        /// that is referenced by the <paramref name="elementUsage"/> as well as <see cref="NestedParameter"/>s that are based on the <see cref="ParameterOverride"/>
-        /// that are contained by the <paramref name="elementUsage"/> itself.
-        /// </summary>
-        /// <param name="elementUsage">
-        /// The <see cref="ElementUsage"/> that corresponds to the <see cref="NestedElement"/> for which <see cref="NestedParameter"/>s need to be created
-        /// </param>
-        /// <param name="domainOfExpertise">
-        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
-        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
-        /// </param>
-        /// <param name="option">
-        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. 
-        /// </param>
-        /// <returns>
-        /// An <see cref="IEnumerable{NestedParameter}"/>.
-        /// </returns>
-        private IEnumerable<NestedParameter> CreateNestedParameters(ElementUsage elementUsage, DomainOfExpertise domainOfExpertise, Option option)
-        {
-            var elementDefinition = elementUsage.ElementDefinition;
-
-            foreach (var parameter in elementDefinition.Parameter)
-            {
-                var compoundParameterType = parameter.ParameterType as CompoundParameterType;
-
-                var parameterOveride = elementUsage.ParameterOverride.SingleOrDefault(po => po.Parameter == parameter);
-                if (parameterOveride == null)
-                {
-                    if (parameter.Owner == domainOfExpertise)
-                    {
-                        var valueSets = parameter.IsOptionDependent ? parameter.ValueSet.Where(vs => vs.ActualOption == option).ToList() : parameter.ValueSet;
-
-                        foreach (var parameterValueSet in valueSets)
-                        {
-                            if (compoundParameterType == null)
-                            {
-                                var nestedParameter = this.CreatedNestedParameter(parameter, null, parameterValueSet);
-                                yield return nestedParameter;
-                            }
-                            else
-                            {
-                                foreach (var component in compoundParameterType.Component)
-                                {
-                                    var comp = (ParameterTypeComponent)component;
-                                    var nestedParameter = this.CreatedNestedParameter(parameter, comp, parameterValueSet);
-                                    yield return nestedParameter;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        var subscription = parameter.ParameterSubscription.SingleOrDefault(ps => ps.Owner == domainOfExpertise);
-                        if (subscription != null)
-                        {
-                            var nestedParameters = this.CreatedNestedParameters(subscription, option, compoundParameterType);
-                            foreach (var nestedParameter in nestedParameters)
-                            {
-                                yield return nestedParameter;
-                            }
-                        }
-                    }                    
-                }
-                else
-                {
-                    if (parameterOveride.Owner == domainOfExpertise)
-                    {
-                        var valueSets = parameterOveride.IsOptionDependent ? parameterOveride.ValueSet.Where(vs => vs.ActualOption == option).ToList() : parameterOveride.ValueSet;                        
-                        foreach (var parameterOverrideValueSet in valueSets)
-                        {
-                            if (compoundParameterType == null)
-                            {
-                                var nestedParameter = this.CreatedNestedParameter(parameter, null, parameterOverrideValueSet);
-                                yield return nestedParameter;
-                            }
-                            else
-                            {
-                                foreach (var component in compoundParameterType.Component)
-                                {
-                                    var comp = (ParameterTypeComponent)component;
-                                    var nestedParameter = this.CreatedNestedParameter(parameter, comp, parameterOverrideValueSet);
-                                    yield return nestedParameter;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        var subscription = parameterOveride.ParameterSubscription.SingleOrDefault(ps => ps.Owner == domainOfExpertise);
-                        if (subscription != null)
-                        {
-                            var nestedParameters = this.CreatedNestedParameters(subscription, option, compoundParameterType);
-                            foreach (var nestedParameter in nestedParameters)
-                            {
-                                yield return nestedParameter;
-                            }                            
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a <see cref="NestedParameter"/> based on the provided <see cref="ParameterOrOverrideBase"/> and <see cref="ParameterValueSetBase"/>
-        /// </summary>
-        /// <param name="subscription">
-        /// The <see cref="ParameterSubscription"/> that contains the <see cref="ParameterSubscriptionValueSet"/> based on which the 
-        /// <see cref="NestedParameter"/> is created.
-        /// </param>
-        /// <param name="option">
-        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. 
-        /// </param>
-        /// <param name="compoundParameterType">
-        /// The <see cref="CompoundParameterType"/> that contains the <see cref="ParameterTypeComponent"/> for which distinct <see cref="NestedParameter"/>
-        /// are created.
-        /// </param>
-        /// <returns>
-        /// An instance of a non-volatile <see cref="NestedParameter"/>
-        /// </returns>
-        private IEnumerable<NestedParameter> CreatedNestedParameters(ParameterSubscription subscription, Option option, CompoundParameterType compoundParameterType)
-        {
-            var valueSets = subscription.IsOptionDependent ? subscription.ValueSet.Where(vs => vs.ActualOption == option).ToList() : subscription.ValueSet;
-            foreach (var parameterSubscriptionValueSet in valueSets)
-            {
-                if (compoundParameterType == null)
-                {
-                    var nestedParameter = this.CreateNestedParameter(subscription, null, parameterSubscriptionValueSet);
-                    yield return nestedParameter;
-                }
-                else
-                {
-                    foreach (var component in compoundParameterType.Component)
-                    {
-                        var comp = (ParameterTypeComponent)component;
-                        var nestedParameter = this.CreateNestedParameter(subscription, comp, parameterSubscriptionValueSet);
-                        yield return nestedParameter;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Creates a <see cref="NestedParameter"/> based on the provided <see cref="ParameterOrOverrideBase"/> and <see cref="ParameterValueSetBase"/>
-        /// </summary>
-        /// <param name="parameter">
-        /// The <see cref="ParameterOrOverrideBase"/> that contains the <see cref="ParameterValueSetBase"/> based on which the 
-        /// <see cref="NestedParameter"/> is created.
-        /// </param>
-        /// <param name="component">
-        /// The <see cref="ParameterTypeComponent"/> that this <see cref="NestedParameter"/> is associated to. This may be null in case the <see cref="ParameterType"/>
-        /// of the associated <see cref="Parameter"/> is a <see cref="ScalarParameterType"/>.
-        /// </param>
-        /// <param name="valueSet">
-        /// The <see cref="ParameterValueSetBase"/> that provides the reference to the <see cref="ActualFiniteState"/> and values
-        /// to create the <see cref="NestedParameter"/>
-        /// </param>
-        /// <returns>
-        /// An instance of a non-volatile <see cref="NestedParameter"/>
-        /// </returns>
-        private NestedParameter CreatedNestedParameter(ParameterOrOverrideBase parameter, ParameterTypeComponent component, ParameterValueSetBase valueSet)
-        {
-            var componentIndex = component == null ? 0 : component.Index;
-            var actualValue = valueSet.ActualValue[componentIndex];
-            var formula = valueSet.Formula[componentIndex];
-
-            var nestedParameter = new NestedParameter(Guid.NewGuid(), parameter.Cache, parameter.IDalUri)
-            {
-                IsVolatile = true,
-                AssociatedParameter = parameter,
-                Owner = parameter.Owner,
-                Component = component,
-                ActualState = valueSet.ActualState,
-                ActualValue = actualValue,
-                Formula = formula
-            };
-
-            return nestedParameter;
-        }
-
-        /// <summary>
-        /// Creates a <see cref="NestedParameter"/> based on the provided <see cref="ParameterOrOverrideBase"/> and <see cref="ParameterValueSetBase"/>
-        /// </summary>
-        /// <param name="subscription">
-        /// The <see cref="ParameterSubscription"/> that contains the <see cref="ParameterSubscriptionValueSet"/> based on which the 
-        /// <see cref="NestedParameter"/> is created.
-        /// </param>
-        /// <param name="component">
-        /// The <see cref="ParameterTypeComponent"/> that this <see cref="NestedParameter"/> is associated to. This may be null in case the <see cref="ParameterType"/>
-        /// of the associated <see cref="Parameter"/> is a <see cref="ScalarParameterType"/>.
-        /// </param>
-        /// <param name="valueSet">
-        /// The <see cref="ParameterSubscriptionValueSet"/> that provides the reference to the <see cref="ActualFiniteState"/> and values
-        /// to create the <see cref="NestedParameter"/>
-        /// </param>
-        /// <returns>
-        /// An instance of a non-volatile <see cref="NestedParameter"/>
-        /// </returns>
-        private NestedParameter CreateNestedParameter(ParameterSubscription subscription, ParameterTypeComponent component, ParameterSubscriptionValueSet valueSet)
-        {
-            var componentIndex = component == null ? 0 : component.Index;
-            var actualValue = valueSet.ActualValue[componentIndex];
-            
-            var nestedParameter = new NestedParameter(Guid.NewGuid(), subscription.Cache, subscription.IDalUri)
-            {
-                IsVolatile = true,
-                AssociatedParameter = subscription,
-                Owner = subscription.Owner,
-                Component = component,
-                ActualState = valueSet.ActualState,
-                ActualValue = actualValue,
-            };
-
-            return nestedParameter;
-        }
-    }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NestedElementTreeGenerator.cs" company="RHEA System  S.A.">
+//   Copyright (c) 2017 RHEA System S.A.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace CDP4Common.Helpers
+{
+    using System;
+    using System.Collections.Generic;   
+    using System.Linq;    
+    using CDP4Common.EngineeringModelData;
+    using CDP4Common.SiteDirectoryData;
+    using NLog;
+    
+    /// <summary>
+    /// The purpose of the <see cref="NestedElementTreeGenerator"/> class is to generate the <see cref="NestedElement"/>s
+    /// and <see cref="NestedParameter"/>s for an <see cref="Option"/> where the <see cref="NestedParameter"/>s
+    /// are owned by a specific <see cref="DomainOfExpertise"/>
+    /// </summary>
+    /// <remarks>
+    /// The <see cref="NestedParameter"/>s represent the owned <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s,
+    /// and <see cref="ParameterSubscription"/>s. Each <see cref="ParameterTypeComponent"/> of a <see cref="CompoundParameterType"/> is 
+    /// represented by a unique <see cref="NestedParameter"/>.
+    /// </remarks>
+    public class NestedElementTreeGenerator
+    {
+        /// <summary>
+        /// The NLog logger
+        /// </summary>
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// Generates the <see cref="NestedElement"/>s and <see cref="NestedParameter"/>s for the specified <see cref="Option"/>
+        /// </summary>
+        /// <param name="option">
+        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree needs to be generated.
+        /// </param>
+        /// <param name="domainOfExpertise">
+        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
+        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
+        /// </param>
+        /// <returns>
+        /// An <see cref="IEnumerable{NestedElement}"/> that contains the generated <see cref="NestedElement"/>s filtered based on the provided <see cref="Option"/>
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        /// thrown when the <paramref name="domainOfExpertise"/> is null
+        /// thrown when the <paramref name="option"/> is null
+        /// </exception>
+        public IEnumerable<NestedElement> Generate(Option option, DomainOfExpertise domainOfExpertise)
+        {
+            if (option == null)
+            {
+                throw new ArgumentNullException("option", "The option may not be null");
+            }
+
+            if (domainOfExpertise == null)
+            {
+                throw new ArgumentNullException("domainOfExpertise", "The domainOfExpertise may not be null");
+            }
+
+            var iteration = (Iteration)option.Container;
+            var rootElement = iteration.TopElement;
+            
+            if (rootElement == null)
+            {
+                throw new NestedElementTreeException(string.Format("The container Iteration of Option {0} does not have a TopElement specified", option.ShortName));
+            }
+
+            Logger.Debug($"Generating NestedElement for Iteration {iteration.Iid}, Option: {option.ShortName}, DomainOfExpertise {domainOfExpertise.ShortName}");
+
+            var createNestedElements = this.GenerateNestedElements(option, domainOfExpertise, rootElement);
+            return createNestedElements;
+        }
+
+        /// <summary>
+        /// Generates the <see cref="NestedElement"/>s starting at the <paramref name="rootElement"/>
+        /// </summary>
+        /// <param name="option">
+        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. When the <see cref="Option"/>
+        /// is null then none of the <see cref="ElementUsage"/>s are filtered.
+        /// </param>
+        /// <param name="domainOfExpertise">
+        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
+        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
+        /// </param>
+        /// <param name="rootElement">
+        /// The <see cref="ElementDefinition"/> that serves as the root of the generated <see cref="NestedElement"/> tree.
+        /// </param>
+        /// <returns>
+        /// An <see cref="IEnumerable{NestedElement}"/> that contains the generated <see cref="NestedElement"/>s
+        /// </returns>
+        /// <exception cref="ArgumentNullException">
+        /// thrown when the <paramref name="domainOfExpertise"/> is null
+        /// thrown when the <paramref name="option"/> is null
+        /// thrown when the <paramref name="rootElement"/> is null
+        /// </exception>
+        public IEnumerable<NestedElement> GenerateNestedElements(Option option, DomainOfExpertise domainOfExpertise, ElementDefinition rootElement)
+        {
+            if (option == null)
+            {
+                throw new ArgumentNullException("option", "The option may not be null");
+            }
+
+            if (domainOfExpertise == null)
+            {
+                throw new ArgumentNullException("domainOfExpertise", "The domainOfExpertise may not be null");
+            }
+
+            if (rootElement == null)
+            {
+                throw new ArgumentNullException("rootElement", "The rootElement may not be null");
+            }
+
+            var nestedElements = new List<NestedElement>();
+            
+            var rootNestedElement = this.CreateNestedElementAndNestedParametersForRootElement(rootElement, domainOfExpertise, option);            
+            nestedElements.Add(rootNestedElement);
+            
+            var elementUsages = new List<ElementUsage>();
+            var recursedNestedElements = this.RecursivelyCreateNestedElements(rootElement, rootElement, domainOfExpertise, elementUsages, option);
+            nestedElements.AddRange(recursedNestedElements);
+
+            return nestedElements;
+        }
+
+        /// <summary>
+        /// Recursively Create <see cref="NestedElement"/>s
+        /// </summary>
+        /// <param name="elementDefinition">
+        /// The <see cref="ElementDefinition"/> that contains <see cref="ElementUsage"/>s that
+        /// </param>
+        /// <param name="rootElement">
+        /// The <see cref="ElementDefinition"/> that is the root of the <see cref="NestedElement"/> tree.
+        /// </param>
+        /// <param name="domainOfExpertise">
+        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
+        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
+        /// </param>
+        /// <param name="elementUsages">
+        /// A <see cref="List{ElementUsage}"/> that contains the <see cref="ElementUsage"/> that define the containment tree
+        /// for the <see cref="NestedElement"/>s at the level of the <paramref name="elementDefinition"/>.
+        /// </param>
+        /// <param name="option">
+        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. When the <see cref="Option"/>
+        /// is null then none of the <see cref="ElementUsage"/>s are filtered.
+        /// </param>
+        /// <returns>
+        /// The <see cref="IEnumerable{NestedElement}"/> that have been created.
+        /// </returns>
+        private IEnumerable<NestedElement> RecursivelyCreateNestedElements(ElementDefinition elementDefinition, ElementDefinition rootElement, DomainOfExpertise domainOfExpertise, List<ElementUsage> elementUsages, Option option)
+        {
+            var cache = elementDefinition.Cache;
+            var uri = elementDefinition.IDalUri;
+
+            foreach (var elementUsage in elementDefinition.ContainedElement)
+            {
+                // comparison is done based on unique identifiers, not on object level. The provided option may be a clone
+                if (elementUsage.ExcludeOption.Any(x => x.Iid == option.Iid))
+                {
+                    Logger.Debug($"ElementUsage {elementUsage.Iid}:{elementUsage.ShortName} is excluded from the Nested Elements.");
+                    continue;
+                }
+
+                var nestedElement = new NestedElement(Guid.NewGuid(), cache, uri)
+                                        {
+                                            RootElement = rootElement,
+                                            IsVolatile = true
+                                        };
+                option.NestedElement.Add(nestedElement);
+
+                var nestedParameters = this.CreateNestedParameters(elementUsage, domainOfExpertise, option);
+                foreach (var nestedParameter in nestedParameters)
+                {
+                    nestedElement.NestedParameter.Add(nestedParameter);
+                }
+                
+                var containmentUsages = new List<ElementUsage>();
+                foreach (var usage in elementUsages)
+                {
+                    nestedElement.ElementUsage.Add(usage);
+                    containmentUsages.Add(usage);
+                }
+
+                nestedElement.ElementUsage.Add(elementUsage);               
+                containmentUsages.Add(elementUsage);
+
+                var referencedElementDefinition = elementUsage.ElementDefinition;
+
+                var nestedElements = this.RecursivelyCreateNestedElements(referencedElementDefinition, rootElement, domainOfExpertise, containmentUsages, option);
+                foreach (var element in nestedElements)
+                {
+                    yield return element;
+                }
+
+                yield return nestedElement;
+            }
+        }
+
+        /// <summary>
+        /// Creates The <see cref="NestedElement"/> and contained <see cref="NestedParameter"/> that represents the <paramref name="rootElement"/>
+        /// </summary>
+        /// <param name="rootElement">
+        /// The <see cref="ElementDefinition"/> that is the root of the <see cref="NestedElement"/> tree.
+        /// </param>
+        /// <param name="domainOfExpertise">
+        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
+        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
+        /// </param>
+        /// <param name="option">
+        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. When the <see cref="Option"/>
+        /// is null then none of the <see cref="ElementUsage"/>s are filtered.
+        /// </param>
+        /// <returns>
+        /// The <see cref="IEnumerable{NestedElement}"/> that have been created.
+        /// </returns>
+        private NestedElement CreateNestedElementAndNestedParametersForRootElement(ElementDefinition rootElement, DomainOfExpertise domainOfExpertise, Option option)
+        {
+            var nestedElement = new NestedElement(Guid.NewGuid(), rootElement.Cache, rootElement.IDalUri)
+            {
+                RootElement = rootElement,
+                IsVolatile = true,
+                IsRootElement = true
+            };
+            option.NestedElement.Add(nestedElement);
+
+            foreach (var parameter in rootElement.Parameter)
+            {
+                var compoundParameterType = parameter.ParameterType as CompoundParameterType;
+
+                if (parameter.Owner == domainOfExpertise)
+                {
+                    var valueSets = parameter.IsOptionDependent ? parameter.ValueSet.Where(vs => vs.ActualOption == option).ToList() : parameter.ValueSet;
+
+                    foreach (var parameterValueSet in valueSets)
+                    {
+                        if (compoundParameterType == null)
+                        {
+                            var nestedParameter = this.CreatedNestedParameter(parameter, null, parameterValueSet);
+                            nestedElement.NestedParameter.Add(nestedParameter);
+                        }
+                        else
+                        {
+                            foreach (var component in compoundParameterType.Component)
+                            {
+                                var comp = (ParameterTypeComponent)component;
+                                var nestedParameter = this.CreatedNestedParameter(parameter, comp, parameterValueSet);
+                                nestedElement.NestedParameter.Add(nestedParameter);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    var subscription = parameter.ParameterSubscription.SingleOrDefault(ps => ps.Owner == domainOfExpertise);
+                    if (subscription != null)
+                    {
+                        var nestedParameters = this.CreatedNestedParameters(subscription, option, compoundParameterType);
+                        foreach (var nestedParameter in nestedParameters)
+                        {
+                            nestedElement.NestedParameter.Add(nestedParameter);
+                        }
+                    }
+                }
+            }
+
+            return nestedElement;
+        }
+
+        /// <summary>
+        /// Creates <see cref="NestedParameter"/>s based on the <see cref="Parameter"/> that are contained by the <see cref="ElementDefinition"/>
+        /// that is referenced by the <paramref name="elementUsage"/> as well as <see cref="NestedParameter"/>s that are based on the <see cref="ParameterOverride"/>
+        /// that are contained by the <paramref name="elementUsage"/> itself.
+        /// </summary>
+        /// <param name="elementUsage">
+        /// The <see cref="ElementUsage"/> that corresponds to the <see cref="NestedElement"/> for which <see cref="NestedParameter"/>s need to be created
+        /// </param>
+        /// <param name="domainOfExpertise">
+        /// The <see cref="DomainOfExpertise"/> for which the <see cref="NestedElement"/> tree needs to be generated. Only the <see cref="Parameter"/>s, <see cref="ParameterOverride"/>s and
+        /// <see cref="ParameterSubscription"/>s that are owned by the <see cref="DomainOfExpertise"/> will be taken into account when generating <see cref="NestedParameter"/>s
+        /// </param>
+        /// <param name="option">
+        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. 
+        /// </param>
+        /// <returns>
+        /// An <see cref="IEnumerable{NestedParameter}"/>.
+        /// </returns>
+        private IEnumerable<NestedParameter> CreateNestedParameters(ElementUsage elementUsage, DomainOfExpertise domainOfExpertise, Option option)
+        {
+            var elementDefinition = elementUsage.ElementDefinition;
+
+            foreach (var parameter in elementDefinition.Parameter)
+            {
+                var compoundParameterType = parameter.ParameterType as CompoundParameterType;
+
+                var parameterOveride = elementUsage.ParameterOverride.SingleOrDefault(po => po.Parameter == parameter);
+                if (parameterOveride == null)
+                {
+                    if (parameter.Owner == domainOfExpertise)
+                    {
+                        var valueSets = parameter.IsOptionDependent ? parameter.ValueSet.Where(vs => vs.ActualOption == option).ToList() : parameter.ValueSet;
+
+                        foreach (var parameterValueSet in valueSets)
+                        {
+                            if (compoundParameterType == null)
+                            {
+                                var nestedParameter = this.CreatedNestedParameter(parameter, null, parameterValueSet);
+                                yield return nestedParameter;
+                            }
+                            else
+                            {
+                                foreach (var component in compoundParameterType.Component)
+                                {
+                                    var comp = (ParameterTypeComponent)component;
+                                    var nestedParameter = this.CreatedNestedParameter(parameter, comp, parameterValueSet);
+                                    yield return nestedParameter;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var subscription = parameter.ParameterSubscription.SingleOrDefault(ps => ps.Owner == domainOfExpertise);
+                        if (subscription != null)
+                        {
+                            var nestedParameters = this.CreatedNestedParameters(subscription, option, compoundParameterType);
+                            foreach (var nestedParameter in nestedParameters)
+                            {
+                                yield return nestedParameter;
+                            }
+                        }
+                    }                    
+                }
+                else
+                {
+                    if (parameterOveride.Owner == domainOfExpertise)
+                    {
+                        var valueSets = parameterOveride.IsOptionDependent ? parameterOveride.ValueSet.Where(vs => vs.ActualOption == option).ToList() : parameterOveride.ValueSet;                        
+                        foreach (var parameterOverrideValueSet in valueSets)
+                        {
+                            if (compoundParameterType == null)
+                            {
+                                var nestedParameter = this.CreatedNestedParameter(parameter, null, parameterOverrideValueSet);
+                                yield return nestedParameter;
+                            }
+                            else
+                            {
+                                foreach (var component in compoundParameterType.Component)
+                                {
+                                    var comp = (ParameterTypeComponent)component;
+                                    var nestedParameter = this.CreatedNestedParameter(parameter, comp, parameterOverrideValueSet);
+                                    yield return nestedParameter;
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var subscription = parameterOveride.ParameterSubscription.SingleOrDefault(ps => ps.Owner == domainOfExpertise);
+                        if (subscription != null)
+                        {
+                            var nestedParameters = this.CreatedNestedParameters(subscription, option, compoundParameterType);
+                            foreach (var nestedParameter in nestedParameters)
+                            {
+                                yield return nestedParameter;
+                            }                            
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="NestedParameter"/> based on the provided <see cref="ParameterOrOverrideBase"/> and <see cref="ParameterValueSetBase"/>
+        /// </summary>
+        /// <param name="subscription">
+        /// The <see cref="ParameterSubscription"/> that contains the <see cref="ParameterSubscriptionValueSet"/> based on which the 
+        /// <see cref="NestedParameter"/> is created.
+        /// </param>
+        /// <param name="option">
+        /// The <see cref="Option"/> for which the <see cref="NestedElement"/> tree is created. 
+        /// </param>
+        /// <param name="compoundParameterType">
+        /// The <see cref="CompoundParameterType"/> that contains the <see cref="ParameterTypeComponent"/> for which distinct <see cref="NestedParameter"/>
+        /// are created.
+        /// </param>
+        /// <returns>
+        /// An instance of a non-volatile <see cref="NestedParameter"/>
+        /// </returns>
+        private IEnumerable<NestedParameter> CreatedNestedParameters(ParameterSubscription subscription, Option option, CompoundParameterType compoundParameterType)
+        {
+            var valueSets = subscription.IsOptionDependent ? subscription.ValueSet.Where(vs => vs.ActualOption == option).ToList() : subscription.ValueSet;
+            foreach (var parameterSubscriptionValueSet in valueSets)
+            {
+                if (compoundParameterType == null)
+                {
+                    var nestedParameter = this.CreateNestedParameter(subscription, null, parameterSubscriptionValueSet);
+                    yield return nestedParameter;
+                }
+                else
+                {
+                    foreach (var component in compoundParameterType.Component)
+                    {
+                        var comp = (ParameterTypeComponent)component;
+                        var nestedParameter = this.CreateNestedParameter(subscription, comp, parameterSubscriptionValueSet);
+                        yield return nestedParameter;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a <see cref="NestedParameter"/> based on the provided <see cref="ParameterOrOverrideBase"/> and <see cref="ParameterValueSetBase"/>
+        /// </summary>
+        /// <param name="parameter">
+        /// The <see cref="ParameterOrOverrideBase"/> that contains the <see cref="ParameterValueSetBase"/> based on which the 
+        /// <see cref="NestedParameter"/> is created.
+        /// </param>
+        /// <param name="component">
+        /// The <see cref="ParameterTypeComponent"/> that this <see cref="NestedParameter"/> is associated to. This may be null in case the <see cref="ParameterType"/>
+        /// of the associated <see cref="Parameter"/> is a <see cref="ScalarParameterType"/>.
+        /// </param>
+        /// <param name="valueSet">
+        /// The <see cref="ParameterValueSetBase"/> that provides the reference to the <see cref="ActualFiniteState"/> and values
+        /// to create the <see cref="NestedParameter"/>
+        /// </param>
+        /// <returns>
+        /// An instance of a non-volatile <see cref="NestedParameter"/>
+        /// </returns>
+        private NestedParameter CreatedNestedParameter(ParameterOrOverrideBase parameter, ParameterTypeComponent component, ParameterValueSetBase valueSet)
+        {
+            var componentIndex = component == null ? 0 : component.Index;
+            var actualValue = valueSet.ActualValue[componentIndex];
+            var formula = valueSet.Formula[componentIndex];
+
+            var nestedParameter = new NestedParameter(Guid.NewGuid(), parameter.Cache, parameter.IDalUri)
+            {
+                IsVolatile = true,
+                AssociatedParameter = parameter,
+                Owner = parameter.Owner,
+                Component = component,
+                ActualState = valueSet.ActualState,
+                ActualValue = actualValue,
+                Formula = formula
+            };
+
+            return nestedParameter;
+        }
+
+        /// <summary>
+        /// Creates a <see cref="NestedParameter"/> based on the provided <see cref="ParameterOrOverrideBase"/> and <see cref="ParameterValueSetBase"/>
+        /// </summary>
+        /// <param name="subscription">
+        /// The <see cref="ParameterSubscription"/> that contains the <see cref="ParameterSubscriptionValueSet"/> based on which the 
+        /// <see cref="NestedParameter"/> is created.
+        /// </param>
+        /// <param name="component">
+        /// The <see cref="ParameterTypeComponent"/> that this <see cref="NestedParameter"/> is associated to. This may be null in case the <see cref="ParameterType"/>
+        /// of the associated <see cref="Parameter"/> is a <see cref="ScalarParameterType"/>.
+        /// </param>
+        /// <param name="valueSet">
+        /// The <see cref="ParameterSubscriptionValueSet"/> that provides the reference to the <see cref="ActualFiniteState"/> and values
+        /// to create the <see cref="NestedParameter"/>
+        /// </param>
+        /// <returns>
+        /// An instance of a non-volatile <see cref="NestedParameter"/>
+        /// </returns>
+        private NestedParameter CreateNestedParameter(ParameterSubscription subscription, ParameterTypeComponent component, ParameterSubscriptionValueSet valueSet)
+        {
+            var componentIndex = component == null ? 0 : component.Index;
+            var actualValue = valueSet.ActualValue[componentIndex];
+            
+            var nestedParameter = new NestedParameter(Guid.NewGuid(), subscription.Cache, subscription.IDalUri)
+            {
+                IsVolatile = true,
+                AssociatedParameter = subscription,
+                Owner = subscription.Owner,
+                Component = component,
+                ActualState = valueSet.ActualState,
+                ActualValue = actualValue,
+            };
+
+            return nestedParameter;
+        }
+    }
+}
diff --git a/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj b/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj
index 9b84b8d71..f0cb5eb3e 100644
--- a/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj
+++ b/CDP4Dal.NetCore.Tests/CDP4Dal.NetCore.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4Dal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4Dal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Dal\CDP4Dal.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4Dal.Tests/CDP4Dal.Tests.csproj b/CDP4Dal.Tests/CDP4Dal.Tests.csproj
index e7c0baa1a..9187c38e9 100644
--- a/CDP4Dal.Tests/CDP4Dal.Tests.csproj
+++ b/CDP4Dal.Tests/CDP4Dal.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4Dal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4Dal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <ProjectReference Include="..\CDP4Dal\CDP4Dal.csproj" />
diff --git a/CDP4Dal/CDP4Dal.csproj b/CDP4Dal/CDP4Dal.csproj
index c9e7ef86e..545962dd2 100644
--- a/CDP4Dal/CDP4Dal.csproj
+++ b/CDP4Dal/CDP4Dal.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard2.0</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4Dal Community Edition</Title>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>CDP4 Data Access Layer library, a consumer of an ECSS-E-TM-10-25 Annex C API</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron, Patxi</Authors>
@@ -16,12 +16,12 @@
     <PackageTags>CDP CDP4 ECSS-E-TM-10-25</PackageTags>
     <PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
     <Configurations>Debug;Release;Dev</Configurations>
-    <PackageReleaseNotes>[Update] to CDP4Common-CE version 1.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>[Update] to CDP4Common-CE version 1.0.3</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4Common-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4Common-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj b/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj
index edfece8b2..06928b370 100644
--- a/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj
+++ b/CDP4JsonFileDal.Tests/CDP4JsonFileDal.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4JsonFileDal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4JsonFileDal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4JsonFileDal\CDP4JsonFileDal.csproj" />
     <PackageReference Include="DotNetZip" Version="1.10.1" />
diff --git a/CDP4JsonFileDal/CDP4JsonFileDal.csproj b/CDP4JsonFileDal/CDP4JsonFileDal.csproj
index d9a17a0cd..7fad02c03 100644
--- a/CDP4JsonFileDal/CDP4JsonFileDal.csproj
+++ b/CDP4JsonFileDal/CDP4JsonFileDal.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4JsonFileDal Community Edition</Title>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>CDP4 Json File Dal Plugin</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron</Authors>
@@ -15,17 +15,13 @@
     <RepositoryUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition.git</RepositoryUrl>
     <PackageTags>CDP CDP4 ECSS-E-TM-10-25</PackageTags>
     <PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>[Update] to CDP4Dal-CE version 1.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>[Update] to CDP4JsonSerializer-CE and CDP4Dal-CE version 1.0.3</PackageReleaseNotes>
   </PropertyGroup>
 
-  <ItemGroup>
-    
-  </ItemGroup>
-
   <ItemGroup>
 
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.2" />
-    <PackageReference Include="CDP4Dal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.3" />
+    <PackageReference Include="CDP4Dal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <ProjectReference Include="..\CDP4JsonSerializer\CDP4JsonSerializer.csproj" />
diff --git a/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj b/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj
index 05dd0196c..5ea4c5182 100644
--- a/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj
+++ b/CDP4JsonSerializer.NetCore.Tests/CDP4JsonSerializer.NetCore.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <ProjectReference Include="..\CDP4JsonSerializer\CDP4JsonSerializer.csproj" />
diff --git a/CDP4JsonSerializer.Tests/CDP4JsonSerializer.Tests.csproj b/CDP4JsonSerializer.Tests/CDP4JsonSerializer.Tests.csproj
index f5c510ec1..81789b014 100644
--- a/CDP4JsonSerializer.Tests/CDP4JsonSerializer.Tests.csproj
+++ b/CDP4JsonSerializer.Tests/CDP4JsonSerializer.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <ProjectReference Include="..\CDP4JsonSerializer\CDP4JsonSerializer.csproj" />
diff --git a/CDP4JsonSerializer/CDP4JsonSerializer.csproj b/CDP4JsonSerializer/CDP4JsonSerializer.csproj
index 75f421bc9..2ac457683 100644
--- a/CDP4JsonSerializer/CDP4JsonSerializer.csproj
+++ b/CDP4JsonSerializer/CDP4JsonSerializer.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard1.6;netstandard2.0</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4JsonSerializer Community Edition</Title>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>CDP4 JSON Serialization Library</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron, Patxi</Authors>
@@ -16,12 +16,12 @@
     <PackageTags>CDP CDP4 ECSS-E-TM-10-25 JSON</PackageTags>
     <PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
     <Configurations>Debug;Release;Dev</Configurations>
-    <PackageReleaseNotes>[Update] to CDP4Common-CE version 1.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>[Update] to CDP4Common-CE version 1.0.3</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4Common-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4Common-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj b/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj
index f4ffe8719..b688f4dcd 100644
--- a/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj
+++ b/CDP4ServicesDal.NetCore.Tests/CDP4ServicesDal.NetCore.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4ServicesDal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4ServicesDal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4ServicesDal\CDP4ServicesDal.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4ServicesDal.Tests/CDP4ServicesDal.Tests.csproj b/CDP4ServicesDal.Tests/CDP4ServicesDal.Tests.csproj
index 53a9a5cc3..017e524c9 100644
--- a/CDP4ServicesDal.Tests/CDP4ServicesDal.Tests.csproj
+++ b/CDP4ServicesDal.Tests/CDP4ServicesDal.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4ServicesDal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4ServicesDal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4ServicesDal\CDP4ServicesDal.csproj" />
     -->
diff --git a/CDP4ServicesDal/CDP4ServicesDal.csproj b/CDP4ServicesDal/CDP4ServicesDal.csproj
index b9ef81441..d1d53b931 100644
--- a/CDP4ServicesDal/CDP4ServicesDal.csproj
+++ b/CDP4ServicesDal/CDP4ServicesDal.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard2.0</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4ServicesDal Community Edition</Title>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>CDP4ServicesDal Dal Plugin</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron</Authors>
@@ -16,13 +16,13 @@
     <PackageTags>CDP CDP4 ECSS-E-TM-10-25</PackageTags>
     <PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
     <Configurations>Debug;Release;Dev</Configurations>
-    <PackageReleaseNotes>[Set] content-type header to application/json on POST</PackageReleaseNotes>
+    <PackageReleaseNotes>[Update] to CDP4JsonSerializer-CE and CDP4Dal-CE version 1.0.3</PackageReleaseNotes>
   </PropertyGroup>
   
   <ItemGroup>
 
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.2" />
-    <PackageReference Include="CDP4Dal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.3" />
+    <PackageReference Include="CDP4Dal-CE" Version="1.0.3" />
     <!--    
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <ProjectReference Include="..\CDP4JsonSerializer\CDP4JsonSerializer.csproj" />
diff --git a/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj b/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj
index d6c41528a..fa53571b2 100644
--- a/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj
+++ b/CDP4WspDal.NetCore.Tests/CDP4WspDal.NetCore.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4WspDal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4WspDal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4WspDal\CDP4WspDal.csproj" />
     <PackageReference Include="NLog" Version="4.5.0-rc03" />
diff --git a/CDP4WspDal.Tests/CDP4WspDal.Tests.csproj b/CDP4WspDal.Tests/CDP4WspDal.Tests.csproj
index fc78b4485..9badf2a64 100644
--- a/CDP4WspDal.Tests/CDP4WspDal.Tests.csproj
+++ b/CDP4WspDal.Tests/CDP4WspDal.Tests.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4WspDal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4WspDal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4WspDal\CDP4WspDal.csproj" />
     -->
diff --git a/CDP4WspDal/CDP4WspDal.csproj b/CDP4WspDal/CDP4WspDal.csproj
index cc8610e0c..9d34fbca1 100644
--- a/CDP4WspDal/CDP4WspDal.csproj
+++ b/CDP4WspDal/CDP4WspDal.csproj
@@ -4,7 +4,7 @@
     <TargetFrameworks>net45;net451;net452;net46;net461;net462;net47;netstandard2.0</TargetFrameworks>
     <Company>RHEA System S.A.</Company>
     <Title>CDP4WspDal Community Edition</Title>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <Description>CDP4 WSP Dal Plugin</Description>
     <Copyright>Copyright © RHEA System S.A.</Copyright>
     <Authors>Sam, Merlin, Alex, Naron</Authors>
@@ -16,13 +16,13 @@
     <PackageTags>CDP CDP4 ECSS-E-TM-10-25</PackageTags>
     <PackageLicenseUrl>https://github.com/RHEAGROUP/CDP4-SDK-Community-Edition/blob/master/LICENSE</PackageLicenseUrl>
     <Configurations>Debug;Release;Dev</Configurations>
-    <PackageReleaseNotes>[Set] content-type header to application/json on POST</PackageReleaseNotes>
+    <PackageReleaseNotes>[Update] to CDP4JsonSerializer-CE and CDP4Dal-CE version 1.0.3</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
 
-    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.2" />
-    <PackageReference Include="CDP4Dal-CE" Version="1.0.2" />
+    <PackageReference Include="CDP4JsonSerializer-CE" Version="1.0.3" />
+    <PackageReference Include="CDP4Dal-CE" Version="1.0.3" />
     <!--
     <ProjectReference Include="..\CDP4Common\CDP4Common.csproj" />
     <ProjectReference Include="..\CDP4JsonSerializer\CDP4JsonSerializer.csproj" />