diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json
index 450428ef7..1dc45c7e3 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json
@@ -26,17 +26,17 @@
         }
     },
     "attributes": {
-        "CompatibilityName":       [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "CompatibilityName",       "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "DeploymentOrder":         [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "DeploymentOrder",         "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
-        "DeploymentPrincipalName": [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "DescriptorBeanClass":     [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "DescriptorBeanClass",     "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "ModuleType":              [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "ModuleType",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "Notes":                   [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "Notes",                   "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "PartitionName":           [ { "version": "[10,)", "wlst_mode": "online",  "wlst_name": "PartitionName",           "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
-        "ResourceClass":           [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "ResourceClass",           "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "SourcePath":              [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "SourcePath",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" } ],
-        "Target":                  [ { "version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target",                  "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
-                                     { "version": "[10,)", "wlst_mode": "online",  "wlst_name": "Targets",                 "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
+        "CompatibilityName":       [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "CompatibilityName",       "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "DeploymentOrder":         [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "DeploymentOrder",         "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
+        "DeploymentPrincipalName": [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "DescriptorBeanClass":     [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "DescriptorBeanClass",     "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "ModuleType":              [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "ModuleType",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "Notes":                   [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "Notes",                   "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "PartitionName":           [ { "version": "[12.2.1,)", "wlst_mode": "online",  "wlst_name": "PartitionName",           "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
+        "ResourceClass":           [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "ResourceClass",           "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "SourcePath":              [ { "version": "[10,)",     "wlst_mode": "both",    "wlst_name": "SourcePath",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" } ],
+        "Target":                  [ { "version": "[10,)",     "wlst_mode": "offline", "wlst_name": "Target",                  "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
+                                     { "version": "[10,)",     "wlst_mode": "online",  "wlst_name": "Targets",                 "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
     },
     "wlst_attributes_path": "WP001",
     "wlst_paths": {
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
index 34796d83b..66e90b8fa 100644
--- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
+++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
@@ -420,7 +420,10 @@
                 "IdleConnectionTimeout":                     [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "IdleConnectionTimeout",                     "wlst_path": "WP001", "default_value": "${0:65}", "derived_default": "${:true}", "wlst_type": "integer"          } ],
                 "IdleIIOPConnectionTimeout":                 [ {"version": "[10,)",     "wlst_mode": "offline", "wlst_name": "IdleIIOPConnectionTimeout",              "wlst_path": "WP001", "default_value": -1,         "wlst_type": "integer"          } ],
                 "InboundCertificateValidation":              [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "InboundCertificateValidation",              "wlst_path": "WP001", "default_value": "${__NULL__:BuiltinSSLValidationOnly}", "derived_default": "${:true}", "wlst_type": "string"           } ],
-                "ListenAddress":                             [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "ListenAddress",                             "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string",          "get_method": "${LSA:GET}", "restart_required": "true" } ],
+                "ListenAddress":                             [
+                    {"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" },
+                    {"version": "[14.1.2,)",   "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": null, "derived_default": true,       "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" }
+                ],
                 "ListenPort":                                [
                     {"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": "${:true}", "wlst_type": "integer", "restart_required": "true" },
                     {"version": "[14.1.2,)",   "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": true,       "wlst_type": "integer", "restart_required": "true" }
@@ -448,7 +451,10 @@
                 ],
                 "ProxyAddress":                              [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "ProxyAddress",                              "wlst_path": "WP001", "default_value": null,       "wlst_type": "string"           } ],
                 "ProxyPort":                                 [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "ProxyPort",                                 "wlst_path": "WP001", "default_value": 80,         "wlst_type": "integer"          } ],
-                "PublicAddress":                             [ {"version": "[10,)",     "wlst_mode": "both", "wlst_name": "PublicAddress",                             "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string",          "get_method": "${LSA:GET}" } ],
+                "PublicAddress":                             [
+                    {"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "PublicAddress", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" },
+                    {"version": "[14.1.2,)",   "wlst_mode": "both", "wlst_name": "PublicAddress", "wlst_path": "WP001", "default_value": null, "derived_default": true,       "wlst_type": "string", "get_method": "${LSA:GET}" }
+                ],
                 "PublicPort":                                [
                     {"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "PublicPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": "${:true}", "wlst_type": "integer" },
                     {"version": "[14.1.2,)",   "wlst_mode": "both", "wlst_name": "PublicPort", "wlst_path": "WP001", "default_value": "${0:7001}", "derived_default": true,       "wlst_type": "integer" }