diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
index 9ea1913c3..7847dad5b 100644
--- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
+++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.Type, out lazyPoco))
             {
-                poco.Type = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.Type = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.TypedFeature, out lazyPoco))
             {
-                poco.TypedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.TypedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs
index 98fd68d5e..6ebaf170a 100644
--- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs
+++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Refere
 
             if (cache.TryGetValue(dto.ReferencedFeature, out lazyPoco))
             {
-                poco.ReferencedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.ReferencedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/SubclassificationExtensions.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/SubclassificationExtensions.cs
index b6ac60748..732ecf96e 100644
--- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/SubclassificationExtensions.cs
+++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtension/SubclassificationExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Classifiers.Sub
 
             if (cache.TryGetValue(dto.Subclassifier, out lazyPoco))
             {
-                poco.Subclassifier = (Core.POCO.Core.Classifiers.Classifier)lazyPoco.Value;
+                poco.Subclassifier = (Core.POCO.Core.Classifiers.IClassifier)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Classifiers.Sub
 
             if (cache.TryGetValue(dto.Superclassifier, out lazyPoco))
             {
-                poco.Superclassifier = (Core.POCO.Core.Classifiers.Classifier)lazyPoco.Value;
+                poco.Superclassifier = (Core.POCO.Core.Classifiers.IClassifier)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.CodeGenerator/Templates/Uml/core-dal-poco-uml-extensions.hbs b/SysML2.NET.CodeGenerator/Templates/Uml/core-dal-poco-uml-extensions.hbs
index 7941725d4..c35baede9 100644
--- a/SysML2.NET.CodeGenerator/Templates/Uml/core-dal-poco-uml-extensions.hbs
+++ b/SysML2.NET.CodeGenerator/Templates/Uml/core-dal-poco-uml-extensions.hbs
@@ -154,18 +154,14 @@ namespace SysML2.NET.Dal
                                 {{#if property.IsComposite}}
                                     {{#if (Property.IsOfTypeBaseElement property)}}
                                         ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}}.Add(lazyPoco.Value);
-                                    {{else if property.Type.IsAbstract }}
-                                        ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}}.Add((Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value);
                                     {{else}}
-                                        ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}}.Add((Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.{{ property.Type.Name }})lazyPoco.Value);
+                                        ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}}.Add((Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value);
                                     {{/if}}
                                 {{else}}
                                     {{#if (Property.IsOfTypeBaseElement property)}}
                                         poco.{{ String.PascalCase property.Name}}.Add(lazyPoco.Value);
-                                    {{else if property.Type.IsAbstract }}
-                                        poco.{{ String.PascalCase property.Name}}.Add((Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value);
                                     {{else}}
-                                        poco.{{ String.PascalCase property.Name}}.Add((Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.{{ property.Type.Name }})lazyPoco.Value);
+                                        poco.{{ String.PascalCase property.Name}}.Add((Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value);
                                     {{/if}}
                                 {{/if}}
                             }
@@ -177,18 +173,14 @@ namespace SysML2.NET.Dal
                             {{#if property.Opposite.IsComposite}}
                                 {{#if (Property.IsOfTypeBaseElement property)}}
                                     ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = lazyPoco.Value;
-                                {{else if property.Type.IsAbstract }}
-                                    ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{else}}
-                                    ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.{{ property.Type.Name }})lazyPoco.Value;
+                                    ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{/if}}
                             {{else}}
                                 {{#if (Property.IsOfTypeBaseElement property)}}
                                     poco.{{ String.PascalCase property.Name}} = lazyPoco.Value;
-                                {{else if property.Type.IsAbstract }}
-                                    poco.{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{else}}
-                                    poco.{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.{{ property.Type.Name }})lazyPoco.Value;
+                                    poco.{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{/if}}
                             {{/if}}
                         }
@@ -207,18 +199,14 @@ namespace SysML2.NET.Dal
                             {{#if property.Opposite.IsComposite}}
                                 {{#if (Property.IsOfTypeBaseElement property)}}
                                     ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = lazyPoco.Value;
-                                {{else if property.Type.IsAbstract }}
-                                    ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{else}}
-                                    ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.{{ property.Type.Name }})lazyPoco.Value;
+                                    ((IContained{{property.Owner.Name}})poco).{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{/if}}
                             {{else}}
                                 {{#if (Property.IsOfTypeBaseElement property)}}
                                     poco.{{ String.PascalCase property.Name}} = lazyPoco.Value;
-                                {{else if property.Type.IsAbstract }}
-                                    poco.{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{else}}
-                                    poco.{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.{{ property.Type.Name }})lazyPoco.Value;
+                                    poco.{{ String.PascalCase property.Name}} = (Core.POCO.{{ #NamedElement.WriteFullyQualifiedNameSpace property.Type }}.I{{ property.Type.Name }})lazyPoco.Value;
                                 {{/if}}
                             {{/if}}
                         }
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugatedPortTypingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugatedPortTypingExtensions.cs
index 0e95f743b..3901df7bf 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugatedPortTypingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugatedPortTypingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Systems.Ports.Conjug
 
             if (cache.TryGetValue(dto.ConjugatedPortDefinition, out lazyPoco))
             {
-                poco.ConjugatedPortDefinition = (Core.POCO.Systems.Ports.ConjugatedPortDefinition)lazyPoco.Value;
+                poco.ConjugatedPortDefinition = (Core.POCO.Systems.Ports.IConjugatedPortDefinition)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Systems.Ports.Conjug
 
             if (cache.TryGetValue(dto.TypedFeature, out lazyPoco))
             {
-                poco.TypedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.TypedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugationExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugationExtensions.cs
index d4a5566ed..31cb7d57b 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugationExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ConjugationExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Conjugati
 
             if (cache.TryGetValue(dto.ConjugatedType, out lazyPoco))
             {
-                poco.ConjugatedType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.ConjugatedType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
@@ -147,7 +147,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Conjugati
 
             if (cache.TryGetValue(dto.OriginalType, out lazyPoco))
             {
-                poco.OriginalType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.OriginalType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/CrossSubsettingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/CrossSubsettingExtensions.cs
index 6c28e1693..f188662c9 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/CrossSubsettingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/CrossSubsettingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.CrossS
 
             if (cache.TryGetValue(dto.CrossedFeature, out lazyPoco))
             {
-                poco.CrossedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.CrossedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/DifferencingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/DifferencingExtensions.cs
index 90bb14f58..fc579570f 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/DifferencingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/DifferencingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Differenc
 
             if (cache.TryGetValue(dto.DifferencingType, out lazyPoco))
             {
-                poco.DifferencingType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.DifferencingType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/DisjoiningExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/DisjoiningExtensions.cs
index 5aef47dd0..83632bde2 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/DisjoiningExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/DisjoiningExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Disjoinin
 
             if (cache.TryGetValue(dto.DisjoiningType, out lazyPoco))
             {
-                poco.DisjoiningType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.DisjoiningType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Disjoinin
 
             if (cache.TryGetValue(dto.TypeDisjoined, out lazyPoco))
             {
-                poco.TypeDisjoined = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.TypeDisjoined = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureChainingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureChainingExtensions.cs
index 778697685..7d88d2848 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureChainingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureChainingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.ChainingFeature, out lazyPoco))
             {
-                poco.ChainingFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.ChainingFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureInvertingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureInvertingExtensions.cs
index 8e0f13d4d..c49432bac 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureInvertingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureInvertingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.FeatureInverted, out lazyPoco))
             {
-                poco.FeatureInverted = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.FeatureInverted = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
@@ -147,7 +147,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.InvertingFeature, out lazyPoco))
             {
-                poco.InvertingFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.InvertingFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
index 2929c6a29..9edb73725 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FeatureTypingExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.Type, out lazyPoco))
             {
-                poco.Type = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.Type = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Featur
 
             if (cache.TryGetValue(dto.TypedFeature, out lazyPoco))
             {
-                poco.TypedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.TypedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/IntersectingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/IntersectingExtensions.cs
index f4047c7ca..379c64930 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/IntersectingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/IntersectingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Intersect
 
             if (cache.TryGetValue(dto.IntersectingType, out lazyPoco))
             {
-                poco.IntersectingType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.IntersectingType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipExposeExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipExposeExtensions.cs
index 009c2138f..f446d0bb5 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipExposeExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipExposeExtensions.cs
@@ -144,7 +144,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Systems.Views.Member
 
             if (cache.TryGetValue(dto.ImportedMembership, out lazyPoco))
             {
-                poco.ImportedMembership = (Core.POCO.Root.Namespaces.Membership)lazyPoco.Value;
+                poco.ImportedMembership = (Core.POCO.Root.Namespaces.IMembership)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipImportExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipImportExtensions.cs
index 03e2cb15e..852ea23be 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipImportExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MembershipImportExtensions.cs
@@ -144,7 +144,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Root.Namespaces.Memb
 
             if (cache.TryGetValue(dto.ImportedMembership, out lazyPoco))
             {
-                poco.ImportedMembership = (Core.POCO.Root.Namespaces.Membership)lazyPoco.Value;
+                poco.ImportedMembership = (Core.POCO.Root.Namespaces.IMembership)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceExposeExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceExposeExtensions.cs
index 9b2d82376..829bd8307 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceExposeExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceExposeExtensions.cs
@@ -144,7 +144,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Systems.Views.Namesp
 
             if (cache.TryGetValue(dto.ImportedNamespace, out lazyPoco))
             {
-                poco.ImportedNamespace = (Core.POCO.Root.Namespaces.Namespace)lazyPoco.Value;
+                poco.ImportedNamespace = (Core.POCO.Root.Namespaces.INamespace)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceImportExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceImportExtensions.cs
index 5452d2814..292bcfea5 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceImportExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/NamespaceImportExtensions.cs
@@ -144,7 +144,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Root.Namespaces.Name
 
             if (cache.TryGetValue(dto.ImportedNamespace, out lazyPoco))
             {
-                poco.ImportedNamespace = (Core.POCO.Root.Namespaces.Namespace)lazyPoco.Value;
+                poco.ImportedNamespace = (Core.POCO.Root.Namespaces.INamespace)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/PortConjugationExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/PortConjugationExtensions.cs
index e52b05a5c..ca50cb76d 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/PortConjugationExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/PortConjugationExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Systems.Ports.PortCo
 
             if (cache.TryGetValue(dto.ConjugatedType, out lazyPoco))
             {
-                poco.ConjugatedType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.ConjugatedType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
@@ -147,7 +147,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Systems.Ports.PortCo
 
             if (cache.TryGetValue(dto.OriginalPortDefinition, out lazyPoco))
             {
-                poco.OriginalPortDefinition = (Core.POCO.Systems.Ports.PortDefinition)lazyPoco.Value;
+                poco.OriginalPortDefinition = (Core.POCO.Systems.Ports.IPortDefinition)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/RedefinitionExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/RedefinitionExtensions.cs
index 2ce2217e3..7b774ebf3 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/RedefinitionExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/RedefinitionExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Redefi
 
             if (cache.TryGetValue(dto.RedefinedFeature, out lazyPoco))
             {
-                poco.RedefinedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.RedefinedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Redefi
 
             if (cache.TryGetValue(dto.RedefiningFeature, out lazyPoco))
             {
-                poco.RedefiningFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.RedefiningFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs
index b84c0a819..86ef65849 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ReferenceSubsettingExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Refere
 
             if (cache.TryGetValue(dto.ReferencedFeature, out lazyPoco))
             {
-                poco.ReferencedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.ReferencedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SpecializationExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SpecializationExtensions.cs
index 09b649270..aafef82cb 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SpecializationExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SpecializationExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Specializ
 
             if (cache.TryGetValue(dto.General, out lazyPoco))
             {
-                poco.General = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.General = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Specializ
 
             if (cache.TryGetValue(dto.Specific, out lazyPoco))
             {
-                poco.Specific = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.Specific = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubclassificationExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubclassificationExtensions.cs
index 2673ce33f..16722aad9 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubclassificationExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubclassificationExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Classifiers.Sub
 
             if (cache.TryGetValue(dto.Subclassifier, out lazyPoco))
             {
-                poco.Subclassifier = (Core.POCO.Core.Classifiers.Classifier)lazyPoco.Value;
+                poco.Subclassifier = (Core.POCO.Core.Classifiers.IClassifier)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Classifiers.Sub
 
             if (cache.TryGetValue(dto.Superclassifier, out lazyPoco))
             {
-                poco.Superclassifier = (Core.POCO.Core.Classifiers.Classifier)lazyPoco.Value;
+                poco.Superclassifier = (Core.POCO.Core.Classifiers.IClassifier)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubsettingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubsettingExtensions.cs
index 0cc56ebb9..68f93d0a4 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubsettingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SubsettingExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Subset
 
             if (cache.TryGetValue(dto.SubsettedFeature, out lazyPoco))
             {
-                poco.SubsettedFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.SubsettedFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
@@ -185,7 +185,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.Subset
 
             if (cache.TryGetValue(dto.SubsettingFeature, out lazyPoco))
             {
-                poco.SubsettingFeature = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.SubsettingFeature = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/TypeFeaturingExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/TypeFeaturingExtensions.cs
index c5f2d2b93..590815350 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/TypeFeaturingExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/TypeFeaturingExtensions.cs
@@ -138,7 +138,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.TypeFe
 
             if (cache.TryGetValue(dto.FeatureOfType, out lazyPoco))
             {
-                poco.FeatureOfType = (Core.POCO.Core.Features.Feature)lazyPoco.Value;
+                poco.FeatureOfType = (Core.POCO.Core.Features.IFeature)lazyPoco.Value;
             }
             else
             {
@@ -147,7 +147,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Features.TypeFe
 
             if (cache.TryGetValue(dto.FeaturingType, out lazyPoco))
             {
-                poco.FeaturingType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.FeaturingType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/UnioningExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/UnioningExtensions.cs
index 0a38a7a0c..ea8cf1921 100644
--- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/UnioningExtensions.cs
+++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/UnioningExtensions.cs
@@ -176,7 +176,7 @@ public static void UpdateReferenceProperties(this Core.POCO.Core.Types.Unioning
 
             if (cache.TryGetValue(dto.UnioningType, out lazyPoco))
             {
-                poco.UnioningType = (Core.POCO.Core.Types.Type)lazyPoco.Value;
+                poco.UnioningType = (Core.POCO.Core.Types.IType)lazyPoco.Value;
             }
             else
             {
diff --git a/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj b/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj
index 740d2582b..576c09a48 100644
--- a/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj
+++ b/SysML2.NET.Viewer/SysML2.NET.Viewer.csproj
@@ -22,7 +22,6 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.8" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.8" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.DotNet.HotReload.WebAssembly.Browser" Version="10.0.204" />
         <PackageReference Include="ReactiveUI" Version="23.2.27" />
         <PackageReference Include="Radzen.Blazor" Version="10.4.7" />
         <PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />