diff --git a/src/managednetworkfabric/HISTORY.rst b/src/managednetworkfabric/HISTORY.rst
index 33ff8bc5748..5e70939e0f4 100644
--- a/src/managednetworkfabric/HISTORY.rst
+++ b/src/managednetworkfabric/HISTORY.rst
@@ -2,6 +2,8 @@
 
 Release History
 ===============
+8.0.0b7
+* Added missing examples and updated verbiage on existing examples
 
 8.0.0b6
 * Enables the 'device refresh-configuration' command that was previously disabled/removed.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/acl/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/acl/_create.py
index 42d91af1e27..c468b66bbe5 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/acl/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/acl/_create.py
@@ -17,10 +17,10 @@
 class Create(AAZCommand):
     """Create a Access Control List resource
 
-    :example: Creates an Access Control List with Configuration type as "File".
+    :example: Create an Access Control List with Configuration type as "File".
         az networkfabric acl create --resource-group "example-rg" --location "westus3" --resource-name "example-accesscontrollist" --configuration-type "File" --acls-url "https://ACL-Storage-URL"
 
-    :example: Creates an Access Control List with Configuration type as "Inline".
+    :example: Create an Access Control List with Configuration type as "Inline".
         az networkfabric acl create --resource-group "example-rg" --location "westus3" --resource-name "example-accesscontrollist" --configuration-type "Inline" --default-action "Permit" --dynamic-match-configurations "[{ipGroups:[{name:'example-ipGroup',ipAddressType:IPv4,ipPrefixes:['10.20.3.1/20']}],vlanGroups:[{name:'example-vlanGroup',vlans:['20-30']}],portGroups:[{name:'example-portGroup',ports:['100-200']}]}]" --match-configurations "[{matchConfigurationName:'example-match',sequenceNumber:123,ipAddressType:IPv4,matchConditions:[{etherTypes:['0x1'],fragments:['0xff00-0xffff'],ipLengths:['4094-9214'],ttlValues:[23],dscpMarkings:[32],portCondition:{flags:[established],portType:SourcePort,layer4Protocol:TCP,ports:['1-20'],portGroupNames:['example-portGroup']},protocolTypes:[TCP],vlanMatchCondition:{vlans:['20-30'],innerVlans:[30],vlanGroupNames:['example-vlanGroup']},ipCondition:{type:SourceIP,prefixType:Prefix,ipPrefixValues:['10.20.20.20/12'],ipGroupNames:['example-ipGroup']}}],actions:[{type:Count,counterName:'example-counter'}]}]"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_reboot.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_reboot.py
index aa51b5bf78b..cbd369672da 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_reboot.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_reboot.py
@@ -17,7 +17,7 @@
 class Reboot(AAZCommand):
     """Reboot the Network Device.
 
-    :example: NetworkDevices_Reboot_MaximumSet_Gen
+    :example: Reboot the Network Device
         az networkfabric device reboot --resource-group example-rg --resource-name example-device --reboot-type GracefulRebootWithZTP
     """
 
@@ -246,13 +246,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_refresh_configuration.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_refresh_configuration.py
index 6cc05e44ac7..721c7369ccb 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_refresh_configuration.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_refresh_configuration.py
@@ -17,7 +17,7 @@
 class RefreshConfiguration(AAZCommand):
     """Refreshes the configuration the Network Device.
 
-    :example: NetworkDevices_RefreshConfiguration_MaximumSet_Gen
+    :example: Run refresh configuration on the Network Device
         az networkfabric device refresh-configuration --resource-group example-rg --resource-name example-device
     """
 
@@ -222,13 +222,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_ro.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_ro.py
index bcb5e85117a..22817d1cb21 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_ro.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_ro.py
@@ -17,7 +17,7 @@
 class RunRo(AAZCommand):
     """Run the RO Command on the Network Device.
 
-    :example: Run ro on the network device
+    :example: Run ro on the Network Device
         az networkfabric device run-ro --resource-name "example-device" --resource-group "example-rg" --ro-command "example command"
     """
 
@@ -275,13 +275,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_rw.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_rw.py
index 4f400face7b..b1558a351f6 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_rw.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_run_rw.py
@@ -17,7 +17,7 @@
 class RunRw(AAZCommand):
     """Run the RW Command on the Network Device.
 
-    :example: Run rw on the network device
+    :example: Run rw on the Network Device
         az networkfabric device run-rw --resource-name "example-device" --resource-group "example-rg" --rw-command "example command"
     """
 
@@ -248,13 +248,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_update_admin_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_update_admin_state.py
index 0811cd85468..05b6b012422 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_update_admin_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_update_admin_state.py
@@ -17,7 +17,7 @@
 class UpdateAdminState(AAZCommand):
     """Updates the Administrative state of the Network Device.
 
-    :example: Update admin state
+    :example: Update the admin state of the Network Device
         az networkfabric device update-admin-state --resource-name "example-device-name" --resource-group "example-RG" --state "UnderMaintenance"
     """
 
@@ -259,13 +259,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_upgrade.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_upgrade.py
index 914cfb8f1b8..0f35b5b929c 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_upgrade.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/device/_upgrade.py
@@ -16,6 +16,9 @@
 )
 class Upgrade(AAZCommand):
     """Upgrades the version of the Network Device.
+
+    :example: Upgrade the Network Device
+        az networkfabric device upgrade --resource-group example-rg --resource-name example-device --version 1.0.0
     """
 
     _aaz_info = {
@@ -242,13 +245,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_update_bfd_administrative_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_update_bfd_administrative_state.py
index 80a15f80893..7506621ebd9 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_update_bfd_administrative_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/externalnetwork/_update_bfd_administrative_state.py
@@ -16,6 +16,9 @@
 )
 class UpdateBfdAdministrativeState(AAZCommand):
     """BFD administrative state for either static or bgp for internalNetwork.
+
+    :example: Update bfd admin state of External Network
+        az networkfabric externalnetwork update-bfd-administrative-state --resource-group example-rg --l3-isolation-domain-name example-externalnetwork --external-network-name example-ext --route-type Static --administrative-state Enable
     """
 
     _aaz_info = {
@@ -265,13 +268,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_arm_configuration_diff.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_arm_configuration_diff.py
index 20fd48c387a..c00d3cf0326 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_arm_configuration_diff.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_arm_configuration_diff.py
@@ -16,6 +16,9 @@
 )
 class ArmConfigurationDiff(AAZCommand):
     """Post action: Triggers diff of NetworkFabric ARM Configuration.
+
+    :example: Run arm configuration diff on the Network Fabric
+        az networkfabric fabric arm-configuration-diff --resource-group example-rg --network-fabric-name example-fabric
     """
 
     _aaz_info = {
@@ -218,13 +221,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_batch_status.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_batch_status.py
index 8ccd0c20896..db54ad9be96 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_batch_status.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_batch_status.py
@@ -16,6 +16,9 @@
 )
 class CommitBatchStatus(AAZCommand):
     """Post action: Returns a status of commit batch operation.
+
+    :example: Run commit batch status on the Network Fabric
+        az networkfabric fabric commit-batch-status --resource-group example-rg --network-fabric-name example-fabric --commit-batch-id batch-id
     """
 
     _aaz_info = {
@@ -256,13 +259,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_configuration.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_configuration.py
index 00ea76901f9..49c055ce64c 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_configuration.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_commit_configuration.py
@@ -17,7 +17,7 @@
 class CommitConfiguration(AAZCommand):
     """Atomic update of the given Network Fabric instance. Sync update of NFA resources at Fabric level.
 
-    :example: Commit Configuration
+    :example: Run commit configuration on the Network Fabric
         az networkfabric fabric commit-configuration --resource-group "example-rg" --resource-name "example-fabric"
     """
 
@@ -222,13 +222,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_deprovision.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_deprovision.py
index c5ccd334554..5388d8a86f2 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_deprovision.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_deprovision.py
@@ -234,13 +234,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_discard_commit_batch.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_discard_commit_batch.py
index 27ed9bd7688..f5622f0488e 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_discard_commit_batch.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_discard_commit_batch.py
@@ -16,6 +16,9 @@
 )
 class DiscardCommitBatch(AAZCommand):
     """Post action: Discards a Batch operation in progress.
+
+    :example: Run discard commit batch on the Network Fabric
+        az networkfabric fabric discard-commit-batch --resource-group example-rg --network-fabric-name example-fabric --commit-batch-id batchId1
     """
 
     _aaz_info = {
@@ -241,13 +244,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_lock_fabric.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_lock_fabric.py
index 042d71dde54..a748aaab48a 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_lock_fabric.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_lock_fabric.py
@@ -16,6 +16,9 @@
 )
 class LockFabric(AAZCommand):
     """Post action: Triggers network fabric lock operation.
+
+    :example: Run lock fabric on the Network Fabric
+        az networkfabric fabric lock-fabric --resource-group example-rg --network-fabric-name example-networkFabric --lock-type Administrative --action Lock
     """
 
     _aaz_info = {
@@ -250,13 +253,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_provision.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_provision.py
index 25c214c9efe..09344f05abc 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_provision.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_provision.py
@@ -234,13 +234,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_upgrade.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_upgrade.py
index a97595c9b1d..4cb427970ee 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_upgrade.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_upgrade.py
@@ -16,6 +16,9 @@
 )
 class Upgrade(AAZCommand):
     """Upgrades the version of the underlying resources in the given Network Fabric instance.
+
+    :example: Upgrade the Network Fabric
+        az networkfabric fabric upgrade --resource-group example-rg --resource-name example-fabric --version 3.x.x --action Start
     """
 
     _aaz_info = {
@@ -249,13 +252,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py
index 085e0fbc04a..0b1f4582b01 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_validate_configuration.py
@@ -17,7 +17,7 @@
 class ValidateConfiguration(AAZCommand):
     """Validates the configuration of the underlying resources in the given Network Fabric instance.
 
-    :example: Validate the configuration
+    :example: Validate the configuration on the Network Fabric
         az networkfabric fabric validate-configuration -g "example-rg" --resource-name "example-nf" --validate-action "Cabling"
     """
 
@@ -252,13 +252,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_view_device_configuration.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_view_device_configuration.py
index 86cb06a302d..8110612bb4b 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_view_device_configuration.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/_view_device_configuration.py
@@ -16,6 +16,9 @@
 )
 class ViewDeviceConfiguration(AAZCommand):
     """Post action: Triggers view of network fabric configuration.
+
+    :example: View device configuration on the Network Fabric
+        az networkfabric fabric view-device-configuration --resource-group example-rg --network-fabric-name example-fabric
     """
 
     _aaz_info = {
@@ -218,13 +221,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_assign.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_assign.py
index d716b1bc345..f452e001cf4 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_assign.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_assign.py
@@ -16,6 +16,9 @@
 )
 class Assign(AAZCommand):
     """Assign the user or system managed identities.
+
+    :example: Assign identity on the Network Fabric
+        az networkfabric fabric identity assign --resource-group example-rg --network-fabric-name example-fabric --system-assigned
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_remove.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_remove.py
index d273c053671..af2ddc3ff22 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_remove.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_remove.py
@@ -16,6 +16,9 @@
 )
 class Remove(AAZCommand):
     """Remove the user or system managed identities.
+
+    :example: Remove identity on the Network Fabric
+        az networkfabric fabric identity remove --resource group example-rg --network-fabric-name example-fabric --system-assigned
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_show.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_show.py
index 29b7e955d76..2d7a044533f 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_show.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/fabric/identity/_show.py
@@ -16,6 +16,9 @@
 )
 class Show(AAZCommand):
     """Show the details of managed identities.
+
+    :example: Show identity on the Network Fabric
+        az networkfabric fabric identity show --resource-group example-rg --network-fabric-name example-fabric
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update.py
index 287687c6cc4..e1eb21c8da6 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update.py
@@ -16,6 +16,9 @@
 )
 class Update(AAZCommand):
     """Update certain properties of the Network Interface resource.
+
+    :example: Update Network Interface
+        az networkfabric interface update -g "example-rg" --network-device-name "example-device" --resource-name "example-interface" --additional-description "additional description"
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update_admin_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update_admin_state.py
index 27e47ebb70d..9d05ceb4573 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update_admin_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/interface/_update_admin_state.py
@@ -272,13 +272,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internalnetwork/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internalnetwork/_create.py
index 2807f172f0e..ceb6adb541f 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internalnetwork/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internalnetwork/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create a Internal Network resource
 
-    :example: Create a Internal Network
+    :example: Create an Internal Network
         az networkfabric internalnetwork create --resource-group "example-rg" --l3-isolation-domain-name "example-l3domain" --resource-name "example-internalNetwork" --vlan-id 2600 --mtu 1500 --extension "NoExtension" --is-monitoring-enabled "True" --connected-ipv4-subnets "[{prefix:'10.0.0.1/21'},{prefix:'10.1.1.1/22'}]" --connected-ipv6-subnets "[{prefix:'2fff::/64'}]" --static-route-configuration "{extension:NPB,bfdConfiguration:{multiplier:5,intervalInMilliSeconds:300},ipv4Routes:[{prefix:'10.1.0.0/24',nextHop:['10.0.0.1','10.0.0.2']},{prefix:'10.1.0.0/24',nextHop:['10.0.0.1','10.0.0.2']}],ipv6Routes:[{prefix:'2fff::/64',nextHop:['3fff::1']}]}" --bgp-configuration  "{bfdConfiguration:{multiplier:5,intervalInMilliSeconds:300},defaultRouteOriginate:True,allowAS:2,allowASOverride:Enable,peerASN:65047,ipv4ListenRangePrefixes:['10.1.1.1/28','10.0.0.1/28'],ipv6ListenRangePrefixes:['2fff::/66'],ipv4NeighborAddress:[{address:'10.0.0.11'},{address:'10.0.0.12'}],ipv6NeighborAddress:[{address:'2fff::'}],v4OverV6BgpSession:'Enabled',v6OverV4BgpSession:'Enabled'}" --import-route-policy "{importIpv4RoutePolicyId:'/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/microsoft.managednetworkfabric/routePolicies/example-routepolicy',importIpv6RoutePolicyId:'/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/microsoft.managednetworkfabric/routePolicies/example-routepolicy'}" --export-route-policy "{exportIpv4RoutePolicyId:'/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/microsoft.managednetworkfabric/routePolicies/example-routepolicy',exportIpv6RoutePolicyId:'/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/microsoft.managednetworkfabric/routePolicies/example-routepolicy'}" --native-ipv4-prefix-limit "{prefixLimits:[{idleTimeExpiry:60,maximumRoutes:5,threshold:50},{idleTimeExpiry:80,maximumRoutes:10,threshold:60}]}" --native-ipv6-prefix-limit "{prefixLimits:[{idleTimeExpiry:60,maximumRoutes:5,threshold:50},{idleTimeExpiry:80,maximumRoutes:10,threshold:60}]}"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internetgatewayrule/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internetgatewayrule/_create.py
index 91aa0b382fd..85411d0031e 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internetgatewayrule/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/internetgatewayrule/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create an Internet Gateway Rule resource
 
-    :example: Create a Internet Gateway Rule
+    :example: Create an Internet Gateway Rule
         az networkfabric internetgatewayrule create --resource-group "example-rg" --location "westus3" --resource-name "example-internetgatewayrule" --rule-properties "{action:Allow,addressList:['10.10.10.10']}"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_create.py
index b6254e5b1eb..372d8808a93 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create a Ip Community resource
 
-    :example: Create a Ip Community
+    :example: Create an Ip Community
         az networkfabric ipcommunity create --resource-group "example-rg" --location "westus3" --resource-name "example-ipcommunity" --ip-community-rules "[{action:Permit,communityMembers:['1:1'],sequenceNumber:1234,wellKnownCommunities:[Internet,GShut]}]"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_update.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_update.py
index 7ab8302fe33..e41ec54cd3b 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_update.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipcommunity/_update.py
@@ -17,7 +17,7 @@
 class Update(AAZCommand):
     """Update to update certain properties of the IP Community resource.
 
-    :example: Update IP Community
+    :example: Update the Ip Community
         az networkfabric ipcommunity update --resource-group "example-rg" --resource-name "example-ipcommunity" --ip-community-rules "[{action:Permit,communityMembers:['1:1'],sequenceNumber:1234,wellKnownCommunities:[Internet,GShut]}]"
     """
 
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_create.py
index 3f564a781d4..249e75ce7d1 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create a Ip Extended Community resource
 
-    :example: Create a Ip Extended Community
+    :example: Create an Ip Extended Community
         az networkfabric ipextendedcommunity create --resource-group "example-rg" --location "westus3" --resource-name "example-ipextendedcommunity" --ip-extended-community-rules "[{action:Permit,sequenceNumber:1234,routeTargets:['1024:219','1001:200']}]"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_update.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_update.py
index 73c028ba65c..9fb2823018b 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_update.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipextendedcommunity/_update.py
@@ -17,7 +17,7 @@
 class Update(AAZCommand):
     """Update to update certain properties of the IP Extended Community resource.
 
-    :example: Update IP Extended Community
+    :example: Update the Ip Extended Community
         az networkfabric ipextendedcommunity update --resource-group "example-rg" --resource-name "example-ipextendedcommunity" --ip-extended-community-rules "[{action:Permit,sequenceNumber:1234,routeTargets:['1024:219','1001:200']}]"
     """
 
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_create.py
index de0f64885ec..67830169065 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create a Ip Prefix resource
 
-    :example: Create a Ip Prefix
+    :example: Create an Ip Prefix
         az networkfabric ipprefix create --resource-group "example-rg" --location "westus3" --resource-name "example-ipprefix" --ip-prefix-rules "[{action:Permit,sequenceNumber:1234,networkPrefix:'1.1.1.0/24',condition:EqualTo,subnetMaskLength:24}]"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_update.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_update.py
index c2bb421d436..8715864900a 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_update.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/ipprefix/_update.py
@@ -17,7 +17,7 @@
 class Update(AAZCommand):
     """Update to update certain properties of the IP Prefix resource.
 
-    :example: Update IP prefix
+    :example: Update the Ip prefix
         az networkfabric ipprefix update  -g "example-rg" --resource-name "example-ipprefix" --ip-prefix-rules "[{action:Permit,sequenceNumber:4155123341,networkPrefix:'10.10.10.10/30',condition:GreaterThanOrEqualTo,subnetMaskLength:10}]"
     """
 
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_create.py
index 5e5664bcc64..88d7357b2b2 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create a L2 Isolation Domain resource
 
-    :example: Create a L2 Isolation Domain
+    :example: Create an L2 Isolation Domain
         az networkfabric l2domain create --resource-group "example-rg" --resource-name "example-l2domain" --location "westus3" --nf-id "/subscriptions/xxxxxx-xxxxxx-xxxx-xxxx-xxxxxx/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/NetworkFabrics/example-fabricName" --vlan-id  501 --mtu 1500
     """
 
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_update_admin_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_update_admin_state.py
index 8ae655ff40e..3c29851b4df 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_update_admin_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l2domain/_update_admin_state.py
@@ -271,13 +271,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_create.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_create.py
index 98174b80a79..a2ddee86c87 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_create.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_create.py
@@ -17,7 +17,7 @@
 class Create(AAZCommand):
     """Create a L3 Isolation Domain resource
 
-    :example: Create a L3 Isolation Domain
+    :example: Create an L3 Isolation Domain
         az networkfabric l3domain create --resource-group "example-rg" --resource-name "example-l3domain" --location "westus3" --nf-id "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/networkFabrics/example-fabricName" --redistribute-connected-subnets "True" --redistribute-static-routes "True" --aggregate-route-configuration "{ipv4Routes:[{prefix:'10.0.0.1/28'},{prefix:'10.0.0.2/28'}],ipv6Routes:[{prefix:'2fff::/64'},{prefix:'2fff::/65'}]}" --connected-subnet-route-policy "{exportRoutePolicy:{exportIpv4RoutePolicyId:'/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxx/resourceGroups/example-rg/providers/microsoft.managednetworkfabric/routePolicies/example-routepolicy'}}"
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_update_admin_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_update_admin_state.py
index 766759e83f1..44554162d32 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_update_admin_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/l3domain/_update_admin_state.py
@@ -271,13 +271,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_delete.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_delete.py
index 9b4b9848e6c..35e8f660e23 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_delete.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_delete.py
@@ -17,6 +17,9 @@
 )
 class Delete(AAZCommand):
     """Delete layer 2 connectivity between compute nodes by managed by named NetworkMonitor name.
+
+    :example: Delete the Network Monitor
+        az networkfabric networkmonitor delete --resource-group rgmanagednetworkfabric --network-monitor-name example-monitor
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_list.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_list.py
index cfe7da4553f..4bb974dbc22 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_list.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_list.py
@@ -16,6 +16,9 @@
 )
 class List(AAZCommand):
     """List NetworkMonitors list by subscription GET method.
+
+    :example: List the Network Monitor
+        az networkfabric networkmonitor list
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_show.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_show.py
index d9603700966..49bed1bc41f 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_show.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_show.py
@@ -16,6 +16,9 @@
 )
 class Show(AAZCommand):
     """Get NetworkMonitor GET method.
+
+    :example: Show the Network Monitor
+        az networkfabric networkmonitor show --resource-group example-rg --network-monitor-name example-monitor
     """
 
     _aaz_info = {
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_update.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_update.py
index 5f70625d044..b52a0cc105b 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_update.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/networkmonitor/_update.py
@@ -17,7 +17,7 @@
 class Update(AAZCommand):
     """Update to update certain properties of the NetworkMonitor resource.
 
-    :example: Update a Network Monitor
+    :example: Update the Network Monitor
         az networkfabric networkmonitor update --network-monitor-name example-nm --resource-group example-rg --bmp-configuration '{"stationConfigurationState":"Enabled","scopeResourceId":"/subscriptions/1234ABCD-0A1B-1234-5678-123456ABCDEF/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/networkFabrics/example-fabric","stationName":"name","stationIp":"10.0.0.1","stationPort":62695,"stationConnectionMode":"Active","stationConnectionProperties":{"keepaliveIdleTime":49,"probeInterval":3558,"probeCount":45},"stationNetwork":"/subscriptions/1234ABCD-0A1B-1234-5678-123456ABCDEF/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/l3IsolationDomains/example-l3domain/internalNetworks/example-internalnetwork","monitoredNetworks":["/subscriptions/1234ABCD-0A1B-1234-5678-123456ABCDEF/resourceGroups/example-rg/providers/Microsoft.ManagedNetworkFabric/l3IsolationDomains/example-l3domain"],"exportPolicy":"All","monitoredAddressFamilies":["All"]}'
 
     :example: Help text for sub parameters under the specific parent can be viewed by using the shorthand syntax '??'. See https://github.com/Azure/azure-cli/tree/dev/doc/shorthand_syntax.md for more about shorthand syntax.
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/nni/_update_bfd_administrative_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/nni/_update_bfd_administrative_state.py
index 4beaf788ea1..0be19fb4cac 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/nni/_update_bfd_administrative_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/nni/_update_bfd_administrative_state.py
@@ -16,6 +16,9 @@
 )
 class UpdateBfdAdministrativeState(AAZCommand):
     """Updates the Admin State.
+
+    :example: Update bfd admin state of the Network To Network Interconnect
+        az networkfabric nni update-bfd-administrative-state --resource-group example-rg --network-fabric-name example-nf --network-to-network-interconnect-name example-nni --route-type Static --administrative-state Enable
     """
 
     _aaz_info = {
@@ -265,13 +268,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_resync.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_resync.py
index 846659b8b70..337614b21c6 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_resync.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_resync.py
@@ -17,7 +17,7 @@
 class Resync(AAZCommand):
     """Implements the operation to the underlying resources.
 
-    :example: Resync Operation
+    :example: Resync the Network Tap
         az networkfabric tap resync --resource-group "example-rg" --network-tap-name "example-networktap"
     """
 
@@ -222,13 +222,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_update_admin_state.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_update_admin_state.py
index ca9605f1e91..8ffeaa65c83 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_update_admin_state.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/tap/_update_admin_state.py
@@ -17,7 +17,7 @@
 class UpdateAdminState(AAZCommand):
     """Enable/Disable a network tap
 
-    :example: Update admin state of Network Tap
+    :example: Update admin state of the Network Tap
         az networkfabric tap update-admin-state --resource-group "example-rg" --resource-name "example-tap" --state "Enable"
     """
 
@@ -271,13 +271,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_resync.py b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_resync.py
index c197982e753..d09105f8f50 100644
--- a/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_resync.py
+++ b/src/managednetworkfabric/azext_managednetworkfabric/aaz/latest/networkfabric/taprule/_resync.py
@@ -17,7 +17,7 @@
 class Resync(AAZCommand):
     """Resync taprule with latest configuration
 
-    :example: Resync operation
+    :example: Resync the Network Tap Rule
         az networkfabric taprule resync --resource-group "example-rg" --resource-name "example-networktaprule"
     """
 
@@ -222,13 +222,16 @@ def _build_schema_error_detail_read(cls, _schema):
         additional_info.Element = AAZObjectType()
 
         _element = _schema_error_detail_read.additional_info.Element
-        _element.info = AAZFreeFormDictType(
+        _element.info = AAZDictType(
             flags={"read_only": True},
         )
         _element.type = AAZStrType(
             flags={"read_only": True},
         )
 
+        info = _schema_error_detail_read.additional_info.Element.info
+        info.Element = AAZAnyType()
+
         details = _schema_error_detail_read.details
         details.Element = AAZObjectType()
         cls._build_schema_error_detail_read(details.Element)
diff --git a/src/managednetworkfabric/setup.py b/src/managednetworkfabric/setup.py
index 7244ddbd478..c32272ce48f 100644
--- a/src/managednetworkfabric/setup.py
+++ b/src/managednetworkfabric/setup.py
@@ -10,7 +10,7 @@
 
 
 # HISTORY.rst entry.
-VERSION = '8.0.0b6'
+VERSION = '8.0.0b7'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers