diff --git a/LXMF/LXMF.py b/LXMF/LXMF.py
index 6e8d479..5225d88 100644
--- a/LXMF/LXMF.py
+++ b/LXMF/LXMF.py
@@ -1,13 +1,16 @@
 APP_NAME = "lxmf"
 
-# WARNING! These specifications are floating and not
+# WARNING! These field specifiers are floating and not
 # yet final! Consider highly experiemental, and expect
 # them to change in the future! You have been warned :)
 
 FIELD_EMBEDDED_LXMS    = 0x01
 FIELD_TELEMETRY        = 0x02
-FIELD_ICON_APPEARANCE  = 0x03
-FIELD_FILE_ATTACHMENTS = 0x04
-FIELD_IMAGE            = 0x05
-FIELD_AUDIO            = 0x06
-FIELD_THREAD           = 0x07
\ No newline at end of file
+FIELD_TELEMETRY_STREAM = 0x03
+FIELD_ICON_APPEARANCE  = 0x04
+FIELD_FILE_ATTACHMENTS = 0x05
+FIELD_IMAGE            = 0x06
+FIELD_AUDIO            = 0x07
+FIELD_THREAD           = 0x08
+FIELD_COMMANDS         = 0x09
+FIELD_RESULTS          = 0x0A
\ No newline at end of file
diff --git a/LXMF/LXMessage.py b/LXMF/LXMessage.py
index ee83721..5c59202 100644
--- a/LXMF/LXMessage.py
+++ b/LXMF/LXMessage.py
@@ -111,7 +111,6 @@ class LXMessage:
 
         self.set_title_from_string(title)
         self.set_content_from_string(content)
-
         self.set_fields(fields)
 
         self.payload      = None
@@ -164,7 +163,7 @@ class LXMessage:
 
     def set_fields(self, fields):
         if isinstance(fields, dict) or fields == None:
-            self.fields = fields
+            self.fields = fields or {}
         else:
             raise ValueError("LXMessage property \"fields\" can only be dict or None")