diff --git a/tactical_agents_telegraf.py b/tactical_agents_telegraf.py
index 90387f7..8be177b 100644
--- a/tactical_agents_telegraf.py
+++ b/tactical_agents_telegraf.py
@@ -76,14 +76,25 @@ class Agent(object):
                       'client_name': self.client_name, 'status': self.status}
         agent_details = self.wmi_details
         agent_details['agent_info'] = new_values
-        return agent_details
+        new_dict = {}
+        for k, v in agent_details.items():
+            new_values = self.prefix_keys(v, k)
+            new_dict[k] = new_values
+        return new_dict
+
+    @staticmethod
+    def prefix_keys(value_dict, prefix):
+        new_dict = {}
+        for key, value in value_dict.items():
+            new_dict[str(prefix) + '_' + str(key)] = value
+        return new_dict
 
     def send_agent_metrics(self, telegraf_client_object):
         for k, v in self.get_agent_metrics().items():
             telegraf_client_object.metric(str(k), v,
                                           tags={
-                                       'hdn': str(str(self.hostname) + '/' + str(self.client_name) + '/' + str(
-                                           self.site_name))})
+                                              'hdn': str(str(self.hostname) + '/' + str(self.client_name) + '/' + str(
+                                                  self.site_name))})
 
     def __str__(self):
         params = [self.agent_id, self.hostname, self.site_name, self.client_name, self.status]