diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index 44ea744ea7b..845dfdb56ae 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -428,6 +428,17 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
         super.postProcessModelProperty(model, property);
+        if (property.isInnerEnum && property.items != null) {
+            // format maps of inner enums to include the classname eg: Dictionary<string, MapTest.InnerEnum>
+            property.datatypeWithEnum = property.datatypeWithEnum.replace(property.items.datatypeWithEnum, model.classname + "." + property.items.datatypeWithEnum);
+            property.dataType = property.datatypeWithEnum;
+        }
+        if (property.isMap || property.isContainer) {
+            // maps of enums will be marked both isMap and isEnum, correct that now
+            property.isEnum = false;
+            property.isInnerEnum = false;
+            property.isString = false;
+        }
     }
 
     @Override
@@ -459,9 +470,58 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
         postProcessEnumRefs(processed);
         updateValueTypeProperty(processed);
         updateNullableTypeProperty(processed);
+
+        for (Map.Entry<String, ModelsMap> entry : objs.entrySet()) {
+            CodegenModel model = ModelUtils.getModelByName(entry.getKey(), objs);
+
+            // TODO: why do these collections contain different instances?
+            // fixing allVars should suffice instead of patching every collection
+            for (CodegenProperty property : model.allVars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.vars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.readWriteVars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.optionalVars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.parentVars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.requiredVars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.readOnlyVars){
+                patchProperty(model, property);
+            }
+            for (CodegenProperty property : model.nonNullableVars){
+                patchProperty(model, property);
+            }
+        }
         return processed;
     }
 
+    private void patchProperty(CodegenModel model, CodegenProperty property){
+        /**
+        * Hotfix for this issue
+        * https://github.com/OpenAPITools/openapi-generator/issues/12155
+        */
+        if (property.dataType.equals("List") && property.getComposedSchemas() != null && property.getComposedSchemas().getAllOf() != null){
+            List<CodegenProperty> composedSchemas = property.getComposedSchemas().getAllOf();
+            if (composedSchemas.size() == 0) {
+                return;
+            }
+            CodegenProperty composedProperty = composedSchemas.stream().findFirst().get();
+            property.dataType = composedProperty.dataType;
+            property.datatypeWithEnum = composedProperty.datatypeWithEnum;
+            property.isMap = composedProperty.isMap;
+            property.isContainer = composedProperty.isContainer;
+        }
+    }
+
     @Override
     protected List<Map<String, Object>> buildEnumVars(List<Object> values, String dataType) {
         List<Map<String, Object>> enumVars = super.buildEnumVars(values, dataType);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
index 562e96640ea..82975676024 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNetCoreClientCodegen.java
@@ -1489,6 +1489,7 @@ public class CSharpNetCoreClientCodegen extends AbstractCSharpCodegen {
                 cm.readOnlyVars.removeIf(item -> item.baseName.equals(v.baseName));
                 cm.requiredVars.removeIf(item -> item.baseName.equals(v.baseName));
                 cm.allVars.removeIf(item -> item.baseName.equals(v.baseName));
+                cm.nonNullableVars.removeIf(item -> item.baseName.equals(v.baseName));
             });
     }
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs
index c799b734ccb..e63ee79f3ea 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -98,33 +98,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum
-        {
-            get{ return _ArrayEnum;}
-            set
-            {
-                _ArrayEnum = value;
-                _flagArrayEnum = true;
-            }
-        }
-        private List<ArrayEnumEnum> _ArrayEnum;
-        private bool _flagArrayEnum;
-
-        /// <summary>
-        /// Returns false as ArrayEnum should not be serialized given that it's read-only.
-        /// </summary>
-        /// <returns>false (boolean)</returns>
-        public bool ShouldSerializeArrayEnum()
-        {
-            return _flagArrayEnum;
-        }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -145,6 +118,30 @@ namespace Org.OpenAPITools.Model
             this.AdditionalProperties = new Dictionary<string, object>();
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum
+        {
+            get{ return _ArrayEnum;}
+            set
+            {
+                _ArrayEnum = value;
+                _flagArrayEnum = true;
+            }
+        }
+        private List<EnumArrays.ArrayEnumEnum> _ArrayEnum;
+        private bool _flagArrayEnum;
+
+        /// <summary>
+        /// Returns false as ArrayEnum should not be serialized given that it's read-only.
+        /// </summary>
+        /// <returns>false (boolean)</returns>
+        public bool ShouldSerializeArrayEnum()
+        {
+            return _flagArrayEnum;
+        }
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -205,7 +202,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs
index 64bdcf20a3d..7e7093e3d0f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-ConditionalSerialization/src/Org.OpenAPITools/Model/MapTest.cs
@@ -52,33 +52,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString
-        {
-            get{ return _MapOfEnumString;}
-            set
-            {
-                _MapOfEnumString = value;
-                _flagMapOfEnumString = true;
-            }
-        }
-        private Dictionary<string, InnerEnum> _MapOfEnumString;
-        private bool _flagMapOfEnumString;
-
-        /// <summary>
-        /// Returns false as MapOfEnumString should not be serialized given that it's read-only.
-        /// </summary>
-        /// <returns>false (boolean)</returns>
-        public bool ShouldSerializeMapOfEnumString()
-        {
-            return _flagMapOfEnumString;
-        }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -136,6 +109,30 @@ namespace Org.OpenAPITools.Model
             return _flagMapMapOfString;
         }
         /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString
+        {
+            get{ return _MapOfEnumString;}
+            set
+            {
+                _MapOfEnumString = value;
+                _flagMapOfEnumString = true;
+            }
+        }
+        private Dictionary<string, MapTest.InnerEnum> _MapOfEnumString;
+        private bool _flagMapOfEnumString;
+
+        /// <summary>
+        /// Returns false as MapOfEnumString should not be serialized given that it's read-only.
+        /// </summary>
+        /// <returns>false (boolean)</returns>
+        public bool ShouldSerializeMapOfEnumString()
+        {
+            return _flagMapOfEnumString;
+        }
+        /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
         [DataMember(Name = "direct_map", EmitDefaultValue = false)]
@@ -248,7 +245,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
index c40bb19edd5..2a27962cc52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
index 03bcebd3d9b..aaee09f7870 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/docs/models/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
index 97e3a3b9649..951d98e6626 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="justSymbol">justSymbol</param>
         /// <param name="arrayEnum">arrayEnum</param>
-        public EnumArrays(JustSymbolEnum? justSymbol = default, List<ArrayEnumEnum>? arrayEnum = default)
+        public EnumArrays(JustSymbolEnum? justSymbol = default, List<EnumArrays.ArrayEnumEnum>? arrayEnum = default)
         {
             JustSymbol = justSymbol;
             ArrayEnum = arrayEnum;
@@ -86,12 +86,11 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
         [JsonPropertyName("array_enum")]
-        public List<ArrayEnumEnum>? ArrayEnum { get; set; }
+        public List<EnumArrays.ArrayEnumEnum>? ArrayEnum { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -144,7 +143,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
index 5a01c403951..64a3380a3d5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Model/MapTest.cs
@@ -38,7 +38,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="mapOfEnumString">mapOfEnumString</param>
         /// <param name="directMap">directMap</param>
         /// <param name="indirectMap">indirectMap</param>
-        public MapTest(Dictionary<string, Dictionary<string, string>>? mapMapOfString = default, Dictionary<string, InnerEnum>? mapOfEnumString = default, Dictionary<string, bool>? directMap = default, Dictionary<string, bool>? indirectMap = default)
+        public MapTest(Dictionary<string, Dictionary<string, string>>? mapMapOfString = default, Dictionary<string, MapTest.InnerEnum>? mapOfEnumString = default, Dictionary<string, bool>? directMap = default, Dictionary<string, bool>? indirectMap = default)
         {
             MapMapOfString = mapMapOfString;
             MapOfEnumString = mapOfEnumString;
@@ -65,19 +65,18 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [JsonPropertyName("map_of_enum_string")]
-        public Dictionary<string, InnerEnum>? MapOfEnumString { get; set; }
-
         /// <summary>
         /// Gets or Sets MapMapOfString
         /// </summary>
         [JsonPropertyName("map_map_of_string")]
         public Dictionary<string, Dictionary<string, string>>? MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [JsonPropertyName("map_of_enum_string")]
+        public Dictionary<string, MapTest.InnerEnum>? MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -146,7 +145,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
index c40bb19edd5..2a27962cc52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
index 03bcebd3d9b..aaee09f7870 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/docs/models/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index 95fff02c568..92f07ad2ee5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="justSymbol">justSymbol</param>
         /// <param name="arrayEnum">arrayEnum</param>
-        public EnumArrays(JustSymbolEnum justSymbol = default, List<ArrayEnumEnum> arrayEnum = default)
+        public EnumArrays(JustSymbolEnum justSymbol = default, List<EnumArrays.ArrayEnumEnum> arrayEnum = default)
         {
             JustSymbol = justSymbol;
             ArrayEnum = arrayEnum;
@@ -84,12 +84,11 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
         [JsonPropertyName("array_enum")]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -142,7 +141,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
index 797a643b7e8..2cf624e2afb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="mapOfEnumString">mapOfEnumString</param>
         /// <param name="directMap">directMap</param>
         /// <param name="indirectMap">indirectMap</param>
-        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString = default, Dictionary<string, InnerEnum> mapOfEnumString = default, Dictionary<string, bool> directMap = default, Dictionary<string, bool> indirectMap = default)
+        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString = default, Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default, Dictionary<string, bool> directMap = default, Dictionary<string, bool> indirectMap = default)
         {
             MapMapOfString = mapMapOfString;
             MapOfEnumString = mapOfEnumString;
@@ -63,19 +63,18 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [JsonPropertyName("map_of_enum_string")]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
-
         /// <summary>
         /// Gets or Sets MapMapOfString
         /// </summary>
         [JsonPropertyName("map_map_of_string")]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [JsonPropertyName("map_of_enum_string")]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -144,7 +143,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
index c40bb19edd5..2a27962cc52 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
index 03bcebd3d9b..aaee09f7870 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/docs/models/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index 95fff02c568..92f07ad2ee5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Model
         /// </summary>
         /// <param name="justSymbol">justSymbol</param>
         /// <param name="arrayEnum">arrayEnum</param>
-        public EnumArrays(JustSymbolEnum justSymbol = default, List<ArrayEnumEnum> arrayEnum = default)
+        public EnumArrays(JustSymbolEnum justSymbol = default, List<EnumArrays.ArrayEnumEnum> arrayEnum = default)
         {
             JustSymbol = justSymbol;
             ArrayEnum = arrayEnum;
@@ -84,12 +84,11 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
         /// <summary>
         /// Gets or Sets ArrayEnum
         /// </summary>
         [JsonPropertyName("array_enum")]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
 
         /// <summary>
         /// Gets or Sets additional properties
@@ -142,7 +141,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
index 797a643b7e8..2cf624e2afb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Model
         /// <param name="mapOfEnumString">mapOfEnumString</param>
         /// <param name="directMap">directMap</param>
         /// <param name="indirectMap">indirectMap</param>
-        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString = default, Dictionary<string, InnerEnum> mapOfEnumString = default, Dictionary<string, bool> directMap = default, Dictionary<string, bool> indirectMap = default)
+        public MapTest(Dictionary<string, Dictionary<string, string>> mapMapOfString = default, Dictionary<string, MapTest.InnerEnum> mapOfEnumString = default, Dictionary<string, bool> directMap = default, Dictionary<string, bool> indirectMap = default)
         {
             MapMapOfString = mapMapOfString;
             MapOfEnumString = mapOfEnumString;
@@ -63,19 +63,18 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [JsonPropertyName("map_of_enum_string")]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
-
         /// <summary>
         /// Gets or Sets MapMapOfString
         /// </summary>
         [JsonPropertyName("map_map_of_string")]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [JsonPropertyName("map_of_enum_string")]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -144,7 +143,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs
index 7e5d509dd8b..5f374bada4a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -79,13 +79,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -98,6 +91,12 @@ namespace Org.OpenAPITools.Model
             this.AdditionalProperties = new Dictionary<string, object>();
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -158,7 +157,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs
index 9a7ca84088e..9685a3a04da 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/MapTest.cs
@@ -53,13 +53,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -82,6 +75,12 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -159,7 +158,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs
index 6d7830c0e8b..69568d6c87d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -78,13 +78,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -97,6 +90,12 @@ namespace Org.OpenAPITools.Model
             this.AdditionalProperties = new Dictionary<string, object>();
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -157,7 +156,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs
index 8b5a73e7736..b2aeedc33ce 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/MapTest.cs
@@ -52,13 +52,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -81,6 +74,12 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -158,7 +157,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs
index 6d7830c0e8b..69568d6c87d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -78,13 +78,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -97,6 +90,12 @@ namespace Org.OpenAPITools.Model
             this.AdditionalProperties = new Dictionary<string, object>();
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -157,7 +156,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs
index 8b5a73e7736..b2aeedc33ce 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net48/src/Org.OpenAPITools/Model/MapTest.cs
@@ -52,13 +52,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -81,6 +74,12 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -158,7 +157,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs
index 6d7830c0e8b..69568d6c87d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -78,13 +78,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -97,6 +90,12 @@ namespace Org.OpenAPITools.Model
             this.AdditionalProperties = new Dictionary<string, object>();
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -157,7 +156,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs
index 8b5a73e7736..b2aeedc33ce 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/MapTest.cs
@@ -52,13 +52,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -81,6 +74,12 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -158,7 +157,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
index 6d7830c0e8b..69568d6c87d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -78,13 +78,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -97,6 +90,12 @@ namespace Org.OpenAPITools.Model
             this.AdditionalProperties = new Dictionary<string, object>();
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
+
         /// <summary>
         /// Gets or Sets additional properties
         /// </summary>
@@ -157,7 +156,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 if (this.AdditionalProperties != null)
                 {
                     hashCode = (hashCode * 59) + this.AdditionalProperties.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
index 8b5a73e7736..b2aeedc33ce 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
@@ -52,13 +52,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -81,6 +74,12 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -158,7 +157,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
index 8881585a4c7..62e34f03dbc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
index dc1ebba4e76..516f9d4fd37 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
@@ -5,7 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
index 89584f4501e..59f55d253de 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -78,13 +78,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -96,6 +89,12 @@ namespace Org.OpenAPITools.Model
             this.ArrayEnum = arrayEnum;
         }
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name = "array_enum", EmitDefaultValue = false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
+
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -149,7 +148,10 @@ namespace Org.OpenAPITools.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.JustSymbol.GetHashCode();
-                hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                if (this.ArrayEnum != null)
+                {
+                    hashCode = (hashCode * 59) + this.ArrayEnum.GetHashCode();
+                }
                 return hashCode;
             }
         }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs
index d947debc81c..3c07f00331a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/MapTest.cs
@@ -52,13 +52,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -80,6 +73,12 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name = "map_map_of_string", EmitDefaultValue = false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name = "map_of_enum_string", EmitDefaultValue = false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
+
         /// <summary>
         /// Gets or Sets DirectMap
         /// </summary>
@@ -150,7 +149,10 @@ namespace Org.OpenAPITools.Model
                 {
                     hashCode = (hashCode * 59) + this.MapMapOfString.GetHashCode();
                 }
-                hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                if (this.MapOfEnumString != null)
+                {
+                    hashCode = (hashCode * 59) + this.MapOfEnumString.GetHashCode();
+                }
                 if (this.DirectMap != null)
                 {
                     hashCode = (hashCode * 59) + this.DirectMap.GetHashCode();
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md
index 9d58d25f972..880e2248c9d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/EnumArrays.md
@@ -6,7 +6,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **List&lt;string&gt;** |  | [optional] 
+**ArrayEnum** | **List&lt;EnumArrays.ArrayEnumEnum&gt;** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models)
 [[Back to API list]](../README.md#documentation-for-api-endpoints)
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
index 79d499e2cf9..654ac325839 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/MapTest.md
@@ -6,7 +6,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **MapMapOfString** | **Dictionary&lt;string, Dictionary&lt;string, string&gt;&gt;** |  | [optional] 
-**MapOfEnumString** | **Dictionary&lt;string, string&gt;** |  | [optional] 
+**MapOfEnumString** | **Dictionary&lt;string, MapTest.InnerEnum&gt;** |  | [optional] 
 **DirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 **IndirectMap** | **Dictionary&lt;string, bool&gt;** |  | [optional] 
 
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
index 75c484e6bf2..a7d37ba157d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/EnumArrays.cs
@@ -75,12 +75,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-        /// <summary>
-        /// Gets or Sets ArrayEnum
-        /// </summary>
-        [DataMember(Name="array_enum", EmitDefaultValue=false)]
-        public List<ArrayEnumEnum> ArrayEnum { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumArrays" /> class.
         /// </summary>
@@ -93,6 +87,11 @@ namespace Org.OpenAPITools.Model
         }
 
 
+        /// <summary>
+        /// Gets or Sets ArrayEnum
+        /// </summary>
+        [DataMember(Name="array_enum", EmitDefaultValue=false)]
+        public List<EnumArrays.ArrayEnumEnum> ArrayEnum { get; set; }
 
         /// <summary>
         /// Returns the string presentation of the object
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
index 7382ac573fa..b84ccd0e27e 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/MapTest.cs
@@ -50,12 +50,6 @@ namespace Org.OpenAPITools.Model
 
         }
 
-
-        /// <summary>
-        /// Gets or Sets MapOfEnumString
-        /// </summary>
-        [DataMember(Name="map_of_enum_string", EmitDefaultValue=false)]
-        public Dictionary<string, InnerEnum> MapOfEnumString { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="MapTest" /> class.
         /// </summary>
@@ -77,6 +71,11 @@ namespace Org.OpenAPITools.Model
         [DataMember(Name="map_map_of_string", EmitDefaultValue=false)]
         public Dictionary<string, Dictionary<string, string>> MapMapOfString { get; set; }
 
+        /// <summary>
+        /// Gets or Sets MapOfEnumString
+        /// </summary>
+        [DataMember(Name="map_of_enum_string", EmitDefaultValue=false)]
+        public Dictionary<string, MapTest.InnerEnum> MapOfEnumString { get; set; }
 
         /// <summary>
         /// Gets or Sets DirectMap