diff --git a/beater/wmibeat.go b/beater/wmibeat.go
index ab8615b..4886fc2 100644
--- a/beater/wmibeat.go
+++ b/beater/wmibeat.go
@@ -139,7 +139,7 @@ func (bt *Wmibeat) Run(b *beat.Beat) error {
 					classValues = append(classValues, rowValues)
 					rowValues = nil
 				}
-				allValues = append(allValues, classValues...)
+				allValues = append(allValues, common.MapStr { class.Class: classValues })
 				classValues = nil
 				
 			} else {