diff --git a/capabilities/connect.capabilities.yml b/capabilities/connect.capabilities.yml
index a8b0c08..ecb1aea 100644
--- a/capabilities/connect.capabilities.yml
+++ b/capabilities/connect.capabilities.yml
@@ -280,6 +280,7 @@ properties:
       - MAC-ACL
       - IP-ACL
       - Guest-VLAN
+      - Storm-Control
       # Services
       - Service-SSH
       - Service-RSSH
diff --git a/schema/ethernet.yml b/schema/ethernet.yml
index 7c4d30e..dcad549 100644
--- a/schema/ethernet.yml
+++ b/schema/ethernet.yml
@@ -515,6 +515,7 @@ properties:
             description: Maximum allowed broadcast packets per second. Traffic beyond this is dropped.
             type: integer
             minimum: 0
+            default: 500
       multicast:
         type: object
         properties:
diff --git a/state/link-state.yml b/state/link-state.yml
index 860668b..cc3dab0 100644
--- a/state/link-state.yml
+++ b/state/link-state.yml
@@ -268,32 +268,11 @@ properties:
     type: object
     properties:
       broadcast:
-        type: string
-        description: Runtime status of Broadcast Storm Control on the port.
-          - `enabled`- Actively monitoring and limiting broadcast traffic.
-          - `storming`- Storm condition detected; packets are being dropped.
-          - `disabled`- Feature not applied on this port.
-        enum:
-          - enabled
-          - storming
-          - disabled
+        type: boolean
+        description: Runtime status of Broadcast Storm Control on the port. Return `true`if Storm condition is detected.
       multicast:
-        type: string
-        description: Runtime status of Multicast Storm Control on the port.
-          - `enabled`- Actively monitoring and limiting multicast traffic.
-          - `storming`- Storm condition detected; packets are being dropped.
-          - `disabled`- Feature not applied on this port.
-        enum:
-          - enabled
-          - storming
-          - disabled
+        type: boolean
+        description: Runtime status of Multicast Storm Control on the port. Return `true`if Storm condition is detected.
       unknown-unicast:
-        type: string
-        description: Runtime status of Unknown Unicast Storm Control on the port.
-          - `enabled`- Actively monitoring and limiting unknown unicast traffic.
-          - `storming`- Storm condition detected; packets are being dropped.
-          - `disabled`- Feature not applied on this port.
-        enum:
-          - enabled
-          - storming
-          - disabled
\ No newline at end of file
+        type: boolean
+        description: Runtime status of Unknown Unicast Storm Control on the port. Return `true`if Storm condition is detected.
\ No newline at end of file
diff --git a/ucentral.capabilities.pretty.json b/ucentral.capabilities.pretty.json
index 420295c..4582346 100644
--- a/ucentral.capabilities.pretty.json
+++ b/ucentral.capabilities.pretty.json
@@ -342,6 +342,7 @@
                     "MAC-ACL",
                     "IP-ACL",
                     "Guest-VLAN",
+                    "Storm-Control",
                     "Service-SSH",
                     "Service-RSSH",
                     "Service-Telnet",
diff --git a/ucentral.schema.full.json b/ucentral.schema.full.json
index e6a32c8..3027d13 100644
--- a/ucentral.schema.full.json
+++ b/ucentral.schema.full.json
@@ -768,7 +768,8 @@
                                     "limit-pps": {
                                         "description": "Maximum allowed broadcast packets per second. Traffic beyond this is dropped.",
                                         "type": "integer",
-                                        "minimum": 0
+                                        "minimum": 0,
+                                        "default": 500
                                     }
                                 }
                             },
diff --git a/ucentral.schema.json b/ucentral.schema.json
index 932cfca..d3d2a7c 100644
--- a/ucentral.schema.json
+++ b/ucentral.schema.json
@@ -680,7 +680,8 @@
                                 },
                                 "limit-pps": {
                                     "type": "integer",
-                                    "minimum": 0
+                                    "minimum": 0,
+                                    "default": 500
                                 }
                             }
                         },
diff --git a/ucentral.schema.pretty.json b/ucentral.schema.pretty.json
index 2386b6a..564cb28 100644
--- a/ucentral.schema.pretty.json
+++ b/ucentral.schema.pretty.json
@@ -802,7 +802,8 @@
                                 "limit-pps": {
                                     "description": "Maximum allowed broadcast packets per second. Traffic beyond this is dropped.",
                                     "type": "integer",
-                                    "minimum": 0
+                                    "minimum": 0,
+                                    "default": 500
                                 }
                             }
                         },
diff --git a/ucentral.state.pretty.json b/ucentral.state.pretty.json
index 89c5980..bc2091e 100644
--- a/ucentral.state.pretty.json
+++ b/ucentral.state.pretty.json
@@ -1357,31 +1357,16 @@
                     "type": "object",
                     "properties": {
                         "broadcast": {
-                            "type": "string",
-                            "description": "Runtime status of Broadcast Storm Control on the port. - `enabled`- Actively monitoring and limiting broadcast traffic. - `storming`- Storm condition detected; packets are being dropped. - `disabled`- Feature not applied on this port.",
-                            "enum": [
-                                "enabled",
-                                "storming",
-                                "disabled"
-                            ]
+                            "type": "boolean",
+                            "description": "Runtime status of Broadcast Storm Control on the port. Return `true`if Storm condition is detected."
                         },
                         "multicast": {
-                            "type": "string",
-                            "description": "Runtime status of Multicast Storm Control on the port. - `enabled`- Actively monitoring and limiting multicast traffic. - `storming`- Storm condition detected; packets are being dropped. - `disabled`- Feature not applied on this port.",
-                            "enum": [
-                                "enabled",
-                                "storming",
-                                "disabled"
-                            ]
+                            "type": "boolean",
+                            "description": "Runtime status of Multicast Storm Control on the port. Return `true`if Storm condition is detected."
                         },
                         "unknown-unicast": {
-                            "type": "string",
-                            "description": "Runtime status of Unknown Unicast Storm Control on the port. - `enabled`- Actively monitoring and limiting unknown unicast traffic. - `storming`- Storm condition detected; packets are being dropped. - `disabled`- Feature not applied on this port.",
-                            "enum": [
-                                "enabled",
-                                "storming",
-                                "disabled"
-                            ]
+                            "type": "boolean",
+                            "description": "Runtime status of Unknown Unicast Storm Control on the port. Return `true`if Storm condition is detected."
                         }
                     }
                 }