diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IFeature.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IFeature.cs
index 1285f63b..197842b9 100644
--- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IFeature.cs
+++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IFeature.cs
@@ -271,7 +271,7 @@ public partial interface IFeature : IType
         /// <returns>
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
-        FeatureDirectionKind DirectionFor(IType type) => this.ComputeDirectionForOperation(type);
+        FeatureDirectionKind? DirectionFor(IType type) => this.ComputeDirectionForOperation(type);
 
         /// <summary>
         /// If a Feature has no declaredShortName or declaredName, then its effective shortName is given by the
diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtend/FeatureExtensions.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtend/FeatureExtensions.cs
index ddf26f41..004d42de 100644
--- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtend/FeatureExtensions.cs
+++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPocoExtend/FeatureExtensions.cs
@@ -288,7 +288,7 @@ internal static List<IType> ComputeType(this IFeature featureSubject)
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-        internal static FeatureDirectionKind ComputeDirectionForOperation(this IFeature featureSubject, IType type)
+        internal static FeatureDirectionKind? ComputeDirectionForOperation(this IFeature featureSubject, IType type)
         {
             throw new NotSupportedException("Create a GitHub issue when this method is required");
         }
diff --git a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj
index 01789cd4..c33fdca9 100644
--- a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj
+++ b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj
@@ -1163,6 +1163,7 @@
         <PackageReference Include="Serilog" Version="4.3.1" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
+        <PackageReference Include="uml4net.Reporting" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj
index 2dfdad02..bd02f3af 100644
--- a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj
+++ b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj
@@ -20,9 +20,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis" Version="5.3.0" />
-    <PackageReference Include="uml4net.HandleBars" Version="8.0.0" />
-    <PackageReference Include="uml4net.Reporting" Version="8.0.0" />
-    <PackageReference Include="uml4net.xmi" Version="8.0.0" />
+    <PackageReference Include="uml4net.HandleBars" Version="8.0.1" />
+    <PackageReference Include="uml4net.xmi.Extensions.EnterpriseArchitect" Version="8.0.1" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Resources\HtmlDocs\css\bootstrap-theme.css">
diff --git a/SysML2.NET/Core/AutoGenPoco/IFeature.cs b/SysML2.NET/Core/AutoGenPoco/IFeature.cs
index 3ae22cd7..01f4ab57 100644
--- a/SysML2.NET/Core/AutoGenPoco/IFeature.cs
+++ b/SysML2.NET/Core/AutoGenPoco/IFeature.cs
@@ -271,7 +271,7 @@ public partial interface IFeature : IType
         /// <returns>
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
-        FeatureDirectionKind DirectionFor(IType type) => this.ComputeDirectionForOperation(type);
+        FeatureDirectionKind? DirectionFor(IType type) => this.ComputeDirectionForOperation(type);
 
         /// <summary>
         /// If a Feature has no declaredShortName or declaredName, then its effective shortName is given by the
diff --git a/SysML2.NET/Core/AutoGenPoco/INamespace.cs b/SysML2.NET/Core/AutoGenPoco/INamespace.cs
index d5b64957..22a6d43a 100644
--- a/SysML2.NET/Core/AutoGenPoco/INamespace.cs
+++ b/SysML2.NET/Core/AutoGenPoco/INamespace.cs
@@ -171,7 +171,7 @@ public partial interface INamespace : IElement
         /// <returns>
         /// The expected collection of <see cref="IMembership" />
         /// </returns>
-        List<IMembership> MembershipsOfVisibility(VisibilityKind visibility, List<INamespace> excluded) => this.ComputeMembershipsOfVisibilityOperation(visibility, excluded);
+        List<IMembership> MembershipsOfVisibility(VisibilityKind? visibility, List<INamespace> excluded) => this.ComputeMembershipsOfVisibilityOperation(visibility, excluded);
 
         /// <summary>
         /// Resolve the given qualified name to the named Membership (if any), starting with this Namespace as
diff --git a/SysML2.NET/Core/AutoGenPoco/IType.cs b/SysML2.NET/Core/AutoGenPoco/IType.cs
index 88f72353..73b89fee 100644
--- a/SysML2.NET/Core/AutoGenPoco/IType.cs
+++ b/SysML2.NET/Core/AutoGenPoco/IType.cs
@@ -359,7 +359,7 @@ public partial interface IType : INamespace
         /// <returns>
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
-        FeatureDirectionKind DirectionOf(IFeature feature) => this.ComputeDirectionOfOperation(feature);
+        FeatureDirectionKind? DirectionOf(IFeature feature) => this.ComputeDirectionOfOperation(feature);
 
         /// <summary>
         /// Return the direction of the given feature relative to this Type, excluding a given set of Types from
@@ -374,7 +374,7 @@ public partial interface IType : INamespace
         /// <returns>
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
-        FeatureDirectionKind DirectionOfExcluding(IFeature feature, List<IType> excluded) => this.ComputeDirectionOfExcludingOperation(feature, excluded);
+        FeatureDirectionKind? DirectionOfExcluding(IFeature feature, List<IType> excluded) => this.ComputeDirectionOfExcludingOperation(feature, excluded);
 
         /// <summary>
         /// If this Type is conjugated, then return just the originalType of the Conjugation. Otherwise, return
diff --git a/SysML2.NET/Extend/FeatureExtensions.cs b/SysML2.NET/Extend/FeatureExtensions.cs
index ddf26f41..004d42de 100644
--- a/SysML2.NET/Extend/FeatureExtensions.cs
+++ b/SysML2.NET/Extend/FeatureExtensions.cs
@@ -288,7 +288,7 @@ internal static List<IType> ComputeType(this IFeature featureSubject)
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-        internal static FeatureDirectionKind ComputeDirectionForOperation(this IFeature featureSubject, IType type)
+        internal static FeatureDirectionKind? ComputeDirectionForOperation(this IFeature featureSubject, IType type)
         {
             throw new NotSupportedException("Create a GitHub issue when this method is required");
         }
diff --git a/SysML2.NET/Extend/NamespaceExtensions.cs b/SysML2.NET/Extend/NamespaceExtensions.cs
index 3c88d2ee..adbcb160 100644
--- a/SysML2.NET/Extend/NamespaceExtensions.cs
+++ b/SysML2.NET/Extend/NamespaceExtensions.cs
@@ -229,7 +229,7 @@ internal static List<IMembership> ComputeImportedMembershipsOperation(this IName
         /// The expected collection of <see cref="IMembership" />
         /// </returns>
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-        internal static List<IMembership> ComputeMembershipsOfVisibilityOperation(this INamespace namespaceSubject, VisibilityKind visibility, List<INamespace> excluded)
+        internal static List<IMembership> ComputeMembershipsOfVisibilityOperation(this INamespace namespaceSubject, VisibilityKind? visibility, List<INamespace> excluded)
         {
             throw new NotSupportedException("Create a GitHub issue when this method is required");
         }
diff --git a/SysML2.NET/Extend/TypeExtensions.cs b/SysML2.NET/Extend/TypeExtensions.cs
index 87e7422c..e80b6695 100644
--- a/SysML2.NET/Extend/TypeExtensions.cs
+++ b/SysML2.NET/Extend/TypeExtensions.cs
@@ -526,7 +526,7 @@ internal static List<IFeature> ComputeAllRedefinedFeaturesOfOperation(this IType
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-        internal static FeatureDirectionKind ComputeDirectionOfOperation(this IType typeSubject, IFeature feature)
+        internal static FeatureDirectionKind? ComputeDirectionOfOperation(this IType typeSubject, IFeature feature)
         {
             throw new NotSupportedException("Create a GitHub issue when this method is required");
         }
@@ -548,7 +548,7 @@ internal static FeatureDirectionKind ComputeDirectionOfOperation(this IType type
         /// The expected <see cref="FeatureDirectionKind" />
         /// </returns>
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-        internal static FeatureDirectionKind ComputeDirectionOfExcludingOperation(this IType typeSubject, IFeature feature, List<IType> excluded)
+        internal static FeatureDirectionKind? ComputeDirectionOfExcludingOperation(this IType typeSubject, IFeature feature, List<IType> excluded)
         {
             throw new NotSupportedException("Create a GitHub issue when this method is required");
         }