diff --git a/agent/src/smart_agent.rs b/agent/src/smart_agent.rs
index 4443719..525851b 100644
--- a/agent/src/smart_agent.rs
+++ b/agent/src/smart_agent.rs
@@ -129,13 +129,18 @@ impl SmartAgent {
     async fn collect_realtime_metrics(&mut self) {
         info!("Collecting RealTime metrics (5s)...");
         
-        // Collect and aggregate System metrics into complete message
-        let mut system_data = json!({});
+        // Collect and aggregate System metrics into dashboard-expected format
+        let mut summary = json!({});
+        let mut timestamp = json!(null);
         
         if let Ok(cpu_load) = self.metric_manager.get_metric(&AgentType::System, "cpu_load").await {
             if let Some(obj) = cpu_load.as_object() {
                 for (key, value) in obj {
-                    system_data[key] = value.clone();
+                    if key == "timestamp" {
+                        timestamp = value.clone();
+                    } else {
+                        summary[key] = value.clone();
+                    }
                 }
             }
         }
@@ -143,15 +148,23 @@ impl SmartAgent {
         if let Ok(cpu_temp) = self.metric_manager.get_metric(&AgentType::System, "cpu_temperature").await {
             if let Some(obj) = cpu_temp.as_object() {
                 for (key, value) in obj {
-                    system_data[key] = value.clone();
+                    if key == "timestamp" {
+                        timestamp = value.clone();
+                    } else {
+                        summary[key] = value.clone();
+                    }
                 }
             }
         }
         
-        // Send complete System message if we have any data
-        if !system_data.as_object().unwrap().is_empty() {
-            info!("Sending aggregated System metrics");
-            self.send_metric_data(&AgentType::System, &system_data).await;
+        // Send complete System message with summary structure if we have any data
+        if !summary.as_object().unwrap().is_empty() {
+            let system_message = json!({
+                "summary": summary,
+                "timestamp": timestamp
+            });
+            info!("Sending aggregated System metrics with summary structure");
+            self.send_metric_data(&AgentType::System, &system_message).await;
         }
         
         // Service CPU usage (complete message)
@@ -168,13 +181,21 @@ impl SmartAgent {
     async fn collect_fast_metrics(&mut self) {
         info!("Collecting Fast metrics (30s)...");
         
-        // Collect and aggregate System metrics into complete message
-        let mut system_data = json!({});
+        // Collect and aggregate System metrics into dashboard-expected format
+        let mut summary = json!({});
+        let mut top_level = json!({});
+        let mut timestamp = json!(null);
         
         if let Ok(memory) = self.metric_manager.get_metric(&AgentType::System, "memory").await {
             if let Some(obj) = memory.as_object() {
                 for (key, value) in obj {
-                    system_data[key] = value.clone();
+                    if key == "timestamp" {
+                        timestamp = value.clone();
+                    } else if key.starts_with("system_memory") {
+                        summary[key] = value.clone();
+                    } else {
+                        top_level[key] = value.clone();
+                    }
                 }
             }
         }
@@ -182,15 +203,34 @@ impl SmartAgent {
         if let Ok(processes) = self.metric_manager.get_metric(&AgentType::System, "top_processes").await {
             if let Some(obj) = processes.as_object() {
                 for (key, value) in obj {
-                    system_data[key] = value.clone();
+                    if key == "timestamp" {
+                        timestamp = value.clone();
+                    } else {
+                        top_level[key] = value.clone();
+                    }
                 }
             }
         }
         
-        // Send complete System message if we have any data
-        if !system_data.as_object().unwrap().is_empty() {
-            info!("Sending aggregated System metrics");
-            self.send_metric_data(&AgentType::System, &system_data).await;
+        // Send complete System message with summary structure if we have any data
+        if !summary.as_object().unwrap().is_empty() || !top_level.as_object().unwrap().is_empty() {
+            let mut system_message = json!({
+                "timestamp": timestamp
+            });
+            
+            if !summary.as_object().unwrap().is_empty() {
+                system_message["summary"] = summary;
+            }
+            
+            // Add top-level fields
+            if let Some(obj) = top_level.as_object() {
+                for (key, value) in obj {
+                    system_message[key] = value.clone();
+                }
+            }
+            
+            info!("Sending aggregated System metrics with summary structure");
+            self.send_metric_data(&AgentType::System, &system_message).await;
         }
         
         // Service memory usage (complete message)