Fixes
diff --git a/sdks/dotnet/basyx-components/BaSyx.Components.sln b/sdks/dotnet/basyx-components/BaSyx.Components.sln
index 5693ca7..28e814e 100644
--- a/sdks/dotnet/basyx-components/BaSyx.Components.sln
+++ b/sdks/dotnet/basyx-components/BaSyx.Components.sln
@@ -47,22 +47,10 @@
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaSyx.API.Http.Controllers.AASX", "BaSyx.API.Http.Controllers.AASX\BaSyx.API.Http.Controllers.AASX.csproj", "{D9B9B3E5-B45C-47A3-ADE5-34499D3EA9A8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAssetAdministrationShell", "..\basyx-examples\SimpleAssetAdministrationShell\SimpleAssetAdministrationShell.csproj", "{6E625BC9-AEDB-49BB-94B8-24092083B7DE}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{17391EC4-6892-45AE-9873-B6724C3CB6D2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComplexAssetAdministrationShellScenario", "..\basyx-examples\ComplexAssetAdministrationShellScenario\ComplexAssetAdministrationShellScenario.csproj", "{5DF1DB58-F462-458D-BC92-7A123059A94F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiAssetAdministrationShell", "..\basyx-examples\MultiAssetAdministrationShell\MultiAssetAdministrationShell.csproj", "{F1248088-F4E1-463D-979B-72271AD4DA4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloAssetAdministrationShell", "..\basyx-examples\HelloAssetAdministrationShell\HelloAssetAdministrationShell.csproj", "{088964C6-FE4A-4CF3-9B47-903DF36EA890}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaSyx.Common.UI", "BaSyx.Common.UI\BaSyx.Common.UI.csproj", "{CB4CBEF9-F654-4FBD-9DFB-2340721F24D7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaSyx.Common.UI.Swagger", "BaSyx.Common.UI.Swagger\BaSyx.Common.UI.Swagger.csproj", "{415242FE-C464-48DB-96AD-FF4E02500AB7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClockAssetAdministrationShell", "..\basyx-examples\ClockAssetAdministrationShell\ClockAssetAdministrationShell.csproj", "{26F4B9ED-BF2F-43AA-B59B-187E66305B7B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -129,22 +117,6 @@
 		{D9B9B3E5-B45C-47A3-ADE5-34499D3EA9A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9B9B3E5-B45C-47A3-ADE5-34499D3EA9A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D9B9B3E5-B45C-47A3-ADE5-34499D3EA9A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E625BC9-AEDB-49BB-94B8-24092083B7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E625BC9-AEDB-49BB-94B8-24092083B7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E625BC9-AEDB-49BB-94B8-24092083B7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E625BC9-AEDB-49BB-94B8-24092083B7DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DF1DB58-F462-458D-BC92-7A123059A94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DF1DB58-F462-458D-BC92-7A123059A94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DF1DB58-F462-458D-BC92-7A123059A94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DF1DB58-F462-458D-BC92-7A123059A94F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1248088-F4E1-463D-979B-72271AD4DA4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1248088-F4E1-463D-979B-72271AD4DA4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1248088-F4E1-463D-979B-72271AD4DA4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1248088-F4E1-463D-979B-72271AD4DA4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{088964C6-FE4A-4CF3-9B47-903DF36EA890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{088964C6-FE4A-4CF3-9B47-903DF36EA890}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{088964C6-FE4A-4CF3-9B47-903DF36EA890}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{088964C6-FE4A-4CF3-9B47-903DF36EA890}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB4CBEF9-F654-4FBD-9DFB-2340721F24D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB4CBEF9-F654-4FBD-9DFB-2340721F24D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB4CBEF9-F654-4FBD-9DFB-2340721F24D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -153,10 +125,6 @@
 		{415242FE-C464-48DB-96AD-FF4E02500AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{415242FE-C464-48DB-96AD-FF4E02500AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{415242FE-C464-48DB-96AD-FF4E02500AB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26F4B9ED-BF2F-43AA-B59B-187E66305B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26F4B9ED-BF2F-43AA-B59B-187E66305B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26F4B9ED-BF2F-43AA-B59B-187E66305B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26F4B9ED-BF2F-43AA-B59B-187E66305B7B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -177,13 +145,8 @@
 		{E61A0596-326A-4967-8CA4-FE31A0321603} = {12CD4BF1-B0A6-4DBD-AFB6-6F232C92AAFA}
 		{9C42DEEA-5253-46CC-9674-CA138CD506C0} = {4A2DD35F-BE3B-4802-8A63-07BAB4DA2007}
 		{D9B9B3E5-B45C-47A3-ADE5-34499D3EA9A8} = {4A2DD35F-BE3B-4802-8A63-07BAB4DA2007}
-		{6E625BC9-AEDB-49BB-94B8-24092083B7DE} = {17391EC4-6892-45AE-9873-B6724C3CB6D2}
-		{5DF1DB58-F462-458D-BC92-7A123059A94F} = {17391EC4-6892-45AE-9873-B6724C3CB6D2}
-		{F1248088-F4E1-463D-979B-72271AD4DA4F} = {17391EC4-6892-45AE-9873-B6724C3CB6D2}
-		{088964C6-FE4A-4CF3-9B47-903DF36EA890} = {17391EC4-6892-45AE-9873-B6724C3CB6D2}
 		{CB4CBEF9-F654-4FBD-9DFB-2340721F24D7} = {12CD4BF1-B0A6-4DBD-AFB6-6F232C92AAFA}
 		{415242FE-C464-48DB-96AD-FF4E02500AB7} = {12CD4BF1-B0A6-4DBD-AFB6-6F232C92AAFA}
-		{26F4B9ED-BF2F-43AA-B59B-187E66305B7B} = {17391EC4-6892-45AE-9873-B6724C3CB6D2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8DC440E9-3A4D-4D67-B741-72B8F15EB8C7}
diff --git a/sdks/dotnet/basyx-core/BaSyx.Core.Tests/ExtensionTest.cs b/sdks/dotnet/basyx-core/BaSyx.Core.Tests/ExtensionTest.cs
index 3864017..9b9c3d6 100644
--- a/sdks/dotnet/basyx-core/BaSyx.Core.Tests/ExtensionTest.cs
+++ b/sdks/dotnet/basyx-core/BaSyx.Core.Tests/ExtensionTest.cs
@@ -49,5 +49,54 @@
             string newValue = property.GetValue<string>();
             newValue.Should().BeEquivalentTo("NewTestValue");
         }
+        [TestMethod]
+        public void TestMethod31_TypeProperty_ExternalGetterSetter()
+        {
+            string _value = "StartValue_";
+            Property property = new Property("TestProperty", typeof(string))
+            {
+                Set = (prop, value) => { _value += value.Value; },
+                Get = (prop) => { return new ElementValue<string>("TestGetter_" + _value); }
+            };
+
+            property.SetValue("SuperNewValue");
+            string returnValue = property.GetValue<string>();
+
+            returnValue.Should().BeEquivalentTo("TestGetter_StartValue_SuperNewValue");
+
+            string valueProperty = (string)property.Value;
+
+            valueProperty.Should().BeEquivalentTo("TestGetter_StartValue_SuperNewValue");
+
+            property.Value = "_ResetValue";
+            string resetValueProperty = (string)property.Value;
+
+            resetValueProperty.Should().BeEquivalentTo("TestGetter_StartValue_SuperNewValue_ResetValue");
+        }
+
+        [TestMethod]
+        public void TestMethod32_GenericProperty_ExternalGetterSetter()
+        {
+            string _value = "StartValue_";
+            Property<string> property = new Property<string>("TestProperty")
+            {
+                Set = (prop, value) => { _value += value; },
+                Get = (prop) => { return "TestGetter_" + _value; }
+            };
+
+            property.SetValue("SuperNewValue");
+            string returnValue = property.GetValue<string>();
+
+            returnValue.Should().BeEquivalentTo("TestGetter_StartValue_SuperNewValue");
+
+            string valueProperty = property.Value;
+
+            valueProperty.Should().BeEquivalentTo("TestGetter_StartValue_SuperNewValue");
+
+            property.Value = "_ResetValue";
+            string resetValueProperty = property.Value;
+
+            resetValueProperty.Should().BeEquivalentTo("TestGetter_StartValue_SuperNewValue_ResetValue");
+        }
     }
 }
diff --git a/sdks/dotnet/basyx-core/BaSyx.Core.Tests/SerializationTest.cs b/sdks/dotnet/basyx-core/BaSyx.Core.Tests/SerializationTest.cs
new file mode 100644
index 0000000..7df5ff3
--- /dev/null
+++ b/sdks/dotnet/basyx-core/BaSyx.Core.Tests/SerializationTest.cs
@@ -0,0 +1,27 @@
+´╗┐using BaSyx.Models.Core.AssetAdministrationShell.Identification.BaSyx;
+using BaSyx.Models.Core.AssetAdministrationShell.Implementations;
+using BaSyx.Models.Core.Common;
+using BaSyx.Models.Extensions;
+using FluentAssertions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace BaSyx.Core.Tests
+{
+    [TestClass]
+    public class SerializationTest
+    {
+
+        [TestMethod]
+        public void TestMethod1_SerializeDefaultValues()
+        {
+            Property<int> property = new Property<int>("TestIntegerProperty", 0);
+
+            string jsonProperty = property.ToJson();
+
+            property.SetValue(1);
+
+            jsonProperty = property.ToJson();
+
+        }
+    }
+}
diff --git a/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResource.cs b/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResource.cs
index 48264c6..de2b7ce 100644
--- a/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResource.cs
+++ b/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResource.cs
@@ -58,6 +58,10 @@
                 uri = uri.Substring(0, uri.Length - 2);
                 uri += "#" + instanceNumber;
             }
+
+            if (uri.EndsWith("/"))
+                uri = uri.Remove(uri.Length - 1);
+
             return uri;
         }
         public static string ToUrn(string organisation, string subUnit, string domainId, string version, string revision, string elementId, string instanceNumber)
@@ -82,6 +86,10 @@
                 urn = urn.Substring(0, urn.Length - 2);
                 urn += "#" + instanceNumber;
             }
+
+            if (urn.EndsWith(":"))
+                urn = urn.Remove(urn.Length - 1);
+
             return urn;
         }
 
diff --git a/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResourceName.cs b/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResourceName.cs
index da89688..0ed1c83 100644
--- a/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResourceName.cs
+++ b/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Identification/UniformResourceName.cs
@@ -8,7 +8,6 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 *******************************************************************************/
-using BaSyx.Models.Core.AssetAdministrationShell.Identification;
 
 namespace BaSyx.Models.Core.AssetAdministrationShell.Identification
 {
diff --git a/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Implementations/SubmodelElementTypes/Property.cs b/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Implementations/SubmodelElementTypes/Property.cs
index 051c09b..7f4fac2 100644
--- a/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Implementations/SubmodelElementTypes/Property.cs
+++ b/sdks/dotnet/basyx-core/BaSyx.Models/Core/AssetAdministrationShell/Implementations/SubmodelElementTypes/Property.cs
@@ -23,14 +23,26 @@
     {
         public override ModelType ModelType => ModelType.Property;
 
-        private object _value;
+        /// <summary>
+        /// Only internal temporary storage of the current value. 
+        /// Get and Set operations shall only be processed via its respective handler.
+        /// </summary>
+        protected object _value;
+
         public virtual object Value
         {
-            get => _value;            
+            get
+            {
+                return Get.Invoke(this)?.Value;
+            }            
             set
             {
-                ValueChanged?.Invoke(this, new ValueChangedArgs(this.IdShort, value, ValueType));
-                _value = value;
+                if (value is IValue)
+                    Set.Invoke(this, value as IValue);
+                else
+                    Set.Invoke(this, new ElementValue(value, value.GetType()));
+                        
+                ValueChanged?.Invoke(this, new ValueChangedArgs(this.IdShort, value, value.GetType()));
             }
         }
 
@@ -50,10 +62,11 @@
         public Property(string idShort, DataType valueType, object value) : base(idShort)
         {
             ValueType = valueType;
-            Value = value;
 
-            Get = element  => { return new ElementValue(Value, ValueType); };
-            Set = (element, val) => { Value = val.Value; };
+            _value = value;
+
+            Get = element  => { return new ElementValue(_value, ValueType); };
+            Set = (element, iValue) => { _value = iValue.Value; };
         }
 
         public T ToObject<T>()
@@ -71,50 +84,57 @@
     public class Property<TInnerType> : Property, IProperty<TInnerType>
     {
         public override ModelType ModelType => ModelType.Property;
+        public override DataType ValueType => typeof(TInnerType);
 
-        [DataMember(EmitDefaultValue = false, IsRequired = false, Name = "value")]
+        public new event EventHandler<ValueChangedArgs> ValueChanged;
+        
+        [JsonIgnore, IgnoreDataMember]
         public virtual new TInnerType Value
         {
             get
             {
-                if (base.Value != null)
-                    return (TInnerType)base.Value;
-                else
-                    return default;
+                return Get.Invoke(this);
             }
-            set => base.Value = value;
-        }
-        public override DataType ValueType => typeof(TInnerType);
+            set
+            {
+                Set.Invoke(this, value);
 
-        [IgnoreDataMember]
-        public new GetValueHandler<TInnerType> Get
-        {
-            get
-            {
-                if (base.Get != null)
-                    return new GetValueHandler<TInnerType>(element => { return base.Get.Invoke(element).ToObject<TInnerType>(); });
-                else
-                    return null;
+                ValueChanged?.Invoke(this, new ValueChangedArgs(this.IdShort, value, value.GetType()));
             }
-            set => base.Get = new GetValueHandler(de => new ElementValue<TInnerType>(value.Invoke(de)));
-        }
-        [IgnoreDataMember]
-        public new SetValueHandler<TInnerType> Set
-        {
-            get
-            {
-                if (base.Set != null)
-                    return new SetValueHandler<TInnerType>((element, val) => { base.Set.Invoke(element, new ElementValue<TInnerType>(val)); });
-                else
-                    return null;
-            }
-            set => base.Set = new SetValueHandler((element, val) => value.Invoke(element, val.ToObject<TInnerType>()));
         }
 
-        public Property(string idShort) : base(idShort, typeof(TInnerType)) { }
+        private GetValueHandler<TInnerType> _get;
+        private SetValueHandler<TInnerType> _set;
+
+        [JsonIgnore, IgnoreDataMember]
+        public new GetValueHandler<TInnerType> Get 
+        {
+            get => _get;
+            set
+            {
+                _get = value;
+                base.Get = new GetValueHandler(element => new ElementValue<TInnerType>(_get.Invoke(element)));
+            }
+        }
+        [JsonIgnore, IgnoreDataMember]
+        public new SetValueHandler<TInnerType> Set 
+        {
+            get => _set;
+            set
+            {
+                _set = value;
+                base.Set = new SetValueHandler((element, iValue) => _set.Invoke(element, iValue.ToObject<TInnerType>()));
+            }
+        }
+
+        public Property(string idShort) : this(idShort, default) { }
 
         [JsonConstructor]
-        public Property(string idShort, TInnerType value) : base(idShort, typeof(TInnerType), value) { }
+        public Property(string idShort, TInnerType value) : base(idShort, typeof(TInnerType), value) 
+        {
+            _get = element => { return base.Get.Invoke(element).ToObject<TInnerType>(); };
+            _set = (element, iValue) => { base.Set.Invoke(element, new ElementValue<TInnerType>(iValue)); };
+        }
 
     }
 }
diff --git a/sdks/dotnet/basyx-examples/ClockAssetAdministrationShell/ClockAssetAdministrationShell.csproj b/sdks/dotnet/basyx-examples/ClockAssetAdministrationShell/ClockAssetAdministrationShell.csproj
index 85e3a4b..5121586 100644
--- a/sdks/dotnet/basyx-examples/ClockAssetAdministrationShell/ClockAssetAdministrationShell.csproj
+++ b/sdks/dotnet/basyx-examples/ClockAssetAdministrationShell/ClockAssetAdministrationShell.csproj
@@ -12,13 +12,13 @@
     <Company>Robert Bosch GmbH</Company>
     <PackageTags>BaSys BaSyx Clock Asset Administration Shell Example</PackageTags>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\..\basyx-components\BaSyx.AAS.Client.Http\BaSyx.AAS.Client.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.AAS.Server.Http\BaSyx.AAS.Server.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI.Swagger\BaSyx.Common.UI.Swagger.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI\BaSyx.Common.UI.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Submodel.Server.Http\BaSyx.Submodel.Server.Http.csproj" />
+	<PackageReference Include="BaSyx.AAS.Server.Http" Version="1.0.0" />
+    <PackageReference Include="BaSyx.AAS.Client.Http" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI.Swagger" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Submodel.Server.Http" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sdks/dotnet/basyx-examples/ComplexAssetAdministrationShellScenario/ComplexAssetAdministrationShellScenario.csproj b/sdks/dotnet/basyx-examples/ComplexAssetAdministrationShellScenario/ComplexAssetAdministrationShellScenario.csproj
index d83b4bf..34f8b82 100644
--- a/sdks/dotnet/basyx-examples/ComplexAssetAdministrationShellScenario/ComplexAssetAdministrationShellScenario.csproj
+++ b/sdks/dotnet/basyx-examples/ComplexAssetAdministrationShellScenario/ComplexAssetAdministrationShellScenario.csproj
@@ -15,18 +15,18 @@
   </PropertyGroup>
 
   <ItemGroup>
+	  <PackageReference Include="BaSyx.AAS.Server.Http" Version="1.0.0" />
     <PackageReference Include="BaSyx.AAS.Client.Http" Version="1.0.0" />
+	  <PackageReference Include="BaSyx.Common.UI" Version="1.0.0" />
+	  <PackageReference Include="BaSyx.Common.UI.Swagger" Version="1.0.0" />
+	  <PackageReference Include="BaSyx.Registry.Server.Http" Version="1.0.0" />
     <PackageReference Include="BaSyx.Registry.Client.Http" Version="1.0.0" />
     <PackageReference Include="BaSyx.Registry.ReferenceImpl.FileBased" Version="1.0.0" />
+	  <PackageReference Include="BaSyx.Submodel.Server.Http" Version="1.0.0" />
     <PackageReference Include="BaSyx.Submodel.Client.Http" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\basyx-components\BaSyx.AAS.Server.Http\BaSyx.AAS.Server.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI.Swagger\BaSyx.Common.UI.Swagger.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI\BaSyx.Common.UI.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Registry.Server.Http\BaSyx.Registry.Server.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Submodel.Server.Http\BaSyx.Submodel.Server.Http.csproj" />
     <ProjectReference Include="..\SimpleAssetAdministrationShell\SimpleAssetAdministrationShell.csproj" />
   </ItemGroup>
 
diff --git a/sdks/dotnet/basyx-examples/HelloAssetAdministrationShell/HelloAssetAdministrationShell.csproj b/sdks/dotnet/basyx-examples/HelloAssetAdministrationShell/HelloAssetAdministrationShell.csproj
index bfd353a..e43dd51 100644
--- a/sdks/dotnet/basyx-examples/HelloAssetAdministrationShell/HelloAssetAdministrationShell.csproj
+++ b/sdks/dotnet/basyx-examples/HelloAssetAdministrationShell/HelloAssetAdministrationShell.csproj
@@ -15,17 +15,14 @@
   </PropertyGroup>
  
   <ItemGroup>
+	<PackageReference Include="BaSyx.AAS.Server.Http" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI.Swagger" Version="1.0.0" />
     <PackageReference Include="BaSyx.Utils.Client.Mqtt" Version="1.0.0" />
     <PackageReference Include="NLog" Version="4.7.0" />
   </ItemGroup>
  
   <ItemGroup>
-    <ProjectReference Include="..\..\basyx-components\BaSyx.AAS.Server.Http\BaSyx.AAS.Server.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI.Swagger\BaSyx.Common.UI.Swagger.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI\BaSyx.Common.UI.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
     <None Update="Content\HelloAssetAdministrationShell.pdf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/sdks/dotnet/basyx-examples/MultiAssetAdministrationShell/MultiAssetAdministrationShell.csproj b/sdks/dotnet/basyx-examples/MultiAssetAdministrationShell/MultiAssetAdministrationShell.csproj
index 329aff4..d694423 100644
--- a/sdks/dotnet/basyx-examples/MultiAssetAdministrationShell/MultiAssetAdministrationShell.csproj
+++ b/sdks/dotnet/basyx-examples/MultiAssetAdministrationShell/MultiAssetAdministrationShell.csproj
@@ -15,9 +15,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\basyx-components\BaSyx.AAS.Server.Http\BaSyx.AAS.Server.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI.Swagger\BaSyx.Common.UI.Swagger.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI\BaSyx.Common.UI.csproj" />
+	<PackageReference Include="BaSyx.AAS.Server.Http" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI.Swagger" Version="1.0.0" />
   </ItemGroup>
+  
 
 </Project>
diff --git a/sdks/dotnet/basyx-examples/SimpleAssetAdministrationShell/SimpleAssetAdministrationShell.csproj b/sdks/dotnet/basyx-examples/SimpleAssetAdministrationShell/SimpleAssetAdministrationShell.csproj
index bc52aed..f64cd59 100644
--- a/sdks/dotnet/basyx-examples/SimpleAssetAdministrationShell/SimpleAssetAdministrationShell.csproj
+++ b/sdks/dotnet/basyx-examples/SimpleAssetAdministrationShell/SimpleAssetAdministrationShell.csproj
@@ -13,12 +13,12 @@
     <PackageTags>BaSys BaSyx Simple Asset Administration Shell Example</PackageTags>
     <PackageLicenseExpression>EDL-1.0</PackageLicenseExpression>
   </PropertyGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\..\basyx-components\BaSyx.AAS.Server.Http\BaSyx.AAS.Server.Http.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI.Swagger\BaSyx.Common.UI.Swagger.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Common.UI\BaSyx.Common.UI.csproj" />
-    <ProjectReference Include="..\..\basyx-components\BaSyx.Submodel.Server.Http\BaSyx.Submodel.Server.Http.csproj" />
+	<PackageReference Include="BaSyx.AAS.Server.Http" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Common.UI.Swagger" Version="1.0.0" />
+	<PackageReference Include="BaSyx.Submodel.Server.Http" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.nupkg
index 179eacb..aa67ccc 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.symbols.nupkg
index 476d5f2..bcadc89 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.AAS.Client.Http.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.nupkg
index 322e9b9..6648d2d 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.symbols.nupkg
index 80ff937..885966d 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.AAS.Server.Http.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.nupkg
index fafa161..bc129a8 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.symbols.nupkg
index bc0dd59..b112852 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.API.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.nupkg
index 3ac0565..c451fd2 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.symbols.nupkg
index 8e5bdc3..fa32251 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.nupkg
index d2b0c09..8749ea9 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.symbols.nupkg
index f0751b7..706a145 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.API.Http.Controllers.AASX.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.nupkg
index 58d1fbf..33a7d19 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.symbols.nupkg
index 75d93ba..2f41b3f 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.nupkg
index 083945a..0a4b8cc 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.symbols.nupkg
index 0fc3e3c..2d41cdd 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Common.UI.Swagger.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.nupkg
index 854c3d3..90c9b5e 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.symbols.nupkg
index 4feeafb..fa1b911 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Components.Common.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.nupkg
index 3151d37..5d3cfde 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.symbols.nupkg
index 3baa621..a3ca727 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Discovery.mDNS.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.nupkg
index 7359cb6..551df10 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.symbols.nupkg
index b213b24..91a424f 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Models.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.nupkg
index d507be6..8c4f99f 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.symbols.nupkg
index 75a7b2b..688cac8 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Models.Export.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.nupkg
index c5bebab..08cca4f 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.symbols.nupkg
index 15086f8..1bfe959 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Registry.Client.Http.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.nupkg
index 203d70c..689d0f6 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.symbols.nupkg
index b5db0a7..d8a6c55 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Registry.ReferenceImpl.FileBased.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.nupkg
index 1be77f0..6fb1eaf 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.symbols.nupkg
index 58dcf27..891acdb 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Registry.Server.Http.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.nupkg
index 8b38c5e..1c90a44 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.symbols.nupkg
index 9d96385..8fc203b 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Client.Http.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.nupkg
index e49a08a..5ddb1b7 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.symbols.nupkg
index ecdf7c6..d8a817f 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Submodel.Server.Http.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.nupkg
index 4a721e2..e1632a5 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.symbols.nupkg
index 4e2dfc5..c14bc89 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Utils.Client.Mqtt.1.0.0.symbols.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.nupkg
index 2d59d75..1dfd07c 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.nupkg
Binary files differ
diff --git a/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.symbols.nupkg b/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.symbols.nupkg
index 1f94eb7..b8917f7 100644
--- a/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.symbols.nupkg
+++ b/sdks/dotnet/basyx-packages/BaSyx.Utils.DependencyInjection.1.0.0.symbols.nupkg
Binary files differ