2 files changed, 11 insertions, 5 deletions
diff --git a/src/org/traccar/model/Command.java b/src/org/traccar/model/Command.java
index 842cceac4..cfebaa38e 100644
--- a/src/org/traccar/model/Command.java
+++ b/src/org/traccar/model/Command.java
@@ -22,6 +22,12 @@ public class Command implements Factory {
     public Map<String, Object> getOther() { return other; }
     public void setOther(Map<String, Object> other) { this.other = other; }
 
+    public void set(String key, boolean value) { other.put(key, value); }
+    public void set(String key, int value) { other.put(key, value); }
+    public void set(String key, long value) { other.put(key, value); }
+    public void set(String key, double value) { other.put(key, value); }
+    public void set(String key, String value) { if (value != null && !value.isEmpty()) other.put(key, value); }
+    
     public static final String TYPE_POSITION_SINGLE = "positionSingle";
     public static final String TYPE_POSITION_PERIODIC = "positionPeriodic";
     public static final String TYPE_POSITION_STOP = "positionStop";
diff --git a/src/org/traccar/model/Event.java b/src/org/traccar/model/Event.java
index caee7133b..fba5619d2 100644
--- a/src/org/traccar/model/Event.java
+++ b/src/org/traccar/model/Event.java
@@ -45,11 +45,11 @@ public abstract class Event {
     public Map<String, Object> getOther() { return other; }
     public void setOther(Map<String, Object> other) { this.other = other; }
 
-    public void set(String key, Object value) {
-        if (value != null && (!(value instanceof String) || !((String) value).isEmpty())) {
-            other.put(key, value);
-        }
-    }
+    public void set(String key, boolean value) { other.put(key, value); }
+    public void set(String key, int value) { other.put(key, value); }
+    public void set(String key, long value) { other.put(key, value); }
+    public void set(String key, double value) { other.put(key, value); }
+    public void set(String key, String value) { if (value != null && !value.isEmpty()) other.put(key, value); }
 
     // Words separated by dashes (word-second-third)
     public static final String KEY_INDEX = "index";