diff --git a/DLaB.CrmSvcUtilExtensions/OptionSet/CustomizeCodeDomService.cs b/DLaB.CrmSvcUtilExtensions/OptionSet/CustomizeCodeDomService.cs
index b7f28a21..4cb95fe3 100644
--- a/DLaB.CrmSvcUtilExtensions/OptionSet/CustomizeCodeDomService.cs
+++ b/DLaB.CrmSvcUtilExtensions/OptionSet/CustomizeCodeDomService.cs
@@ -13,12 +13,16 @@ public class CustomizeCodeDomService : TypedServiceBase<ICustomizeCodeDomService
     {
         public bool AddOptionSetMetadataAttribute { get => DLaBSettings.AddOptionSetMetadataAttribute; set => DLaBSettings.AddOptionSetMetadataAttribute = value; }
 
+        #region Constructors
+
         public CustomizeCodeDomService(ICustomizeCodeDomService defaultService, IDictionary<string, string> parameters) : base(defaultService, parameters)
         { }
 
         public CustomizeCodeDomService(ICustomizeCodeDomService defaultService, DLaBModelBuilderSettings settings = null) : base(defaultService, settings)
         { }
 
+        #endregion Constructors
+
         /// <summary>
         /// Remove the unnecessary classes that we generated for entities. 
         /// </summary>
diff --git a/DLaB.EarlyBoundGenerator/Settings/SettingsMapDescriptor.cs b/DLaB.EarlyBoundGenerator/Settings/SettingsMapDescriptor.cs
index 138e4ecb..c8efa2d2 100644
--- a/DLaB.EarlyBoundGenerator/Settings/SettingsMapDescriptor.cs
+++ b/DLaB.EarlyBoundGenerator/Settings/SettingsMapDescriptor.cs
@@ -116,7 +116,6 @@ private void DisableUnsupportedProperties()
             var disabledProperties = new[]
             {
                 nameof(MessageWildcardWhitelist),
-                nameof(GenerateOptionSetMetadataAttribute),
                 nameof(UnmappedProperties),
                 nameof(WorkflowlessActions),
             };