diff --git a/gaia-ccsds-c2a/src/access/cmd/schema.rs b/gaia-ccsds-c2a/src/access/cmd/schema.rs
index 5ba5ce6..3c83e19 100644
--- a/gaia-ccsds-c2a/src/access/cmd/schema.rs
+++ b/gaia-ccsds-c2a/src/access/cmd/schema.rs
@@ -13,6 +13,9 @@ pub struct Metadata {
     pub component_name: String,
     pub command_name: String,
     pub cmd_id: u16,
+    pub is_danger: bool,
+    pub is_restricted: bool,
+    pub target: String,
     pub description: String,
 }
 
@@ -103,6 +106,9 @@ impl<'a> Iterator for Iter<'a> {
                 component_name: self.name.to_string(),
                 command_name: command.name.to_string(),
                 cmd_id: command.code,
+                is_danger: command.is_danger,
+                is_restricted: command.is_restricted,
+                target: command.target.to_string(),
                 description: command.description.to_string(),
             };
             return build_schema(command)
diff --git a/tmtc-c2a/proto/tmtc_generic_c2a.proto b/tmtc-c2a/proto/tmtc_generic_c2a.proto
index a871bda..0d8de82 100644
--- a/tmtc-c2a/proto/tmtc_generic_c2a.proto
+++ b/tmtc-c2a/proto/tmtc_generic_c2a.proto
@@ -45,7 +45,10 @@ message CommandSchema {
 
 message CommandSchemaMetadata {
   uint32 id = 1;
-  string description = 2;
+  bool is_danger = 2;
+  bool is_restricted = 3;
+  string target = 4;
+  string description = 5;
 }
 
 message CommandParameterSchema {
diff --git a/tmtc-c2a/src/registry/cmd.rs b/tmtc-c2a/src/registry/cmd.rs
index 810b31b..8b1dd74 100644
--- a/tmtc-c2a/src/registry/cmd.rs
+++ b/tmtc-c2a/src/registry/cmd.rs
@@ -157,6 +157,9 @@ impl Registry {
                         let command_schema = proto::CommandSchema {
                             metadata: Some(proto::CommandSchemaMetadata {
                                 id: schema_with_id.command_id as u32,
+                                is_danger: metadata.is_danger,
+                                is_restricted: metadata.is_restricted,
+                                target: metadata.target.clone(),
                                 description: metadata.description.clone(),
                             }),
                             parameters,