1 files changed, 41 insertions, 0 deletions
diff --git a/src/org/traccar/model/Message.java b/src/org/traccar/model/Message.java
index bac6661a8..8722acc16 100644
--- a/src/org/traccar/model/Message.java
+++ b/src/org/traccar/model/Message.java
@@ -15,6 +15,9 @@
  */
 package org.traccar.model;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class Message {
 
     private long deviceId;
@@ -37,4 +40,42 @@ public class Message {
         this.type = type;
     }
 
+    private Map<String, Object> attributes = new LinkedHashMap<>();
+
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    public void setAttributes(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
+
+    public void set(String key, boolean value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, int value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, long value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, double value) {
+        attributes.put(key, value);
+    }
+
+    public void set(String key, String value) {
+        if (value != null && !value.isEmpty()) {
+            attributes.put(key, value);
+        }
+    }
+
+    public void add(Map.Entry<String, Object> entry) {
+        if (entry != null && entry.getValue() != null) {
+            attributes.put(entry.getKey(), entry.getValue());
+        }
+    }
+
 }