1 files changed, 4 insertions, 10 deletions
diff --git a/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto b/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
index 9a8582d5..94b40106 100644
--- a/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
+++ b/hv-collector-domain/src/main/proto/measurements/HVMeasFields.proto
@@ -24,20 +24,14 @@ import "MeasDataCollection.proto";          // for 3GPP PM format
 message HVMeasFields
 {
     string hvMeasFieldsVersion = 1;
-    measDataCollection.MeasDataCollection measDataCollection = 2;
-    // From 3GPP TS 28.550
+    MeasDataCollection measDataCollection = 2;
+    // Based on 3GPP TS 28.550
     // Informative: mapping between similar header fields (format may be different)
-    // 3GPP MeasStreamHeader   ONAP/VES CommonEventHeader
+    // 3GPP MeasHeader         ONAP/VES CommonEventHeader
     // senderName              sourceName
     // senderType              nfNamingCode + nfcNamingCode
     // vendorName              nfVendorName
     // collectionBeginTime     startEpochMicrosec
     // timestamp               lastEpochMicrosec
-    repeated HashMap eventAddlFlds = 3;     // optional per-event data
+    map<string, string> eventAddlFlds = 3;     // optional per-event data (name/value HashMap)
 }
-
-message HashMap
-{
-    string name = 1;
-    string value = 2;
-}
-\ No newline at end of file