diff --git a/src/vscp/common/vscp.h b/src/vscp/common/vscp.h
index 5f7ec8027..6b8e5c62b 100644
--- a/src/vscp/common/vscp.h
+++ b/src/vscp/common/vscp.h
@@ -205,6 +205,7 @@ extern "C"
     0x3000 /* GUID is RFC 4122 Version 4 */
 
 #define VSCP_MASK_PRIORITY  0xE0
+#define VSCP_MASK_GUID_TYPE 0x8000 
 #define VSCP_MASK_HARDCODED 0x10
 #define VSCP_MASK_NOCRCCALC 0x08
 
@@ -399,8 +400,8 @@ extern "C"
 #define VSCP_MASK_DATACODING_UNIT  0x18 /* Bits 3,4   */
 #define VSCP_MASK_DATACODING_INDEX 0x07 /* Bits 0,1,2 */
 
-/* These bits are coded in the three MSB bytes of the first data byte   */
-/* in a packet and tells the type of the data that follows.             */
+/* These bits are coded in the three MSB bits of the first data byte   */
+/* of measurement data and tells the type of the data that follows.    */
 #define VSCP_DATACODING_BIT        0x00
 #define VSCP_DATACODING_BYTE       0x20
 #define VSCP_DATACODING_STRING     0x40
diff --git a/src/vscp/common/vscp_class.h b/src/vscp/common/vscp_class.h
index 9c43541ba..5b6d67cb3 100644
--- a/src/vscp/common/vscp_class.h
+++ b/src/vscp/common/vscp_class.h
@@ -47,7 +47,7 @@
             !!!!!!!!!!!!!!!!!!!!  W A R N I N G  !!!!!!!!!!!!!!!!!!!!
                            This file is auto-generated
                 see https://github.com/grodansparadis/vscp-classes
-                        Generated: 2020-02-19 17:52:49.804727
+                        Generated: 2020-02-20 23:04:23.878322
 */
  
 #ifndef VSCP_CLASS_H
diff --git a/src/vscp/common/vscp_hashclass.h b/src/vscp/common/vscp_hashclass.h
index 0c095f462..a57cee7cb 100644
--- a/src/vscp/common/vscp_hashclass.h
+++ b/src/vscp/common/vscp_hashclass.h
@@ -2,7 +2,7 @@
             !!!!!!!!!!!!!!!!!!!!  W A R N I N G  !!!!!!!!!!!!!!!!!!!!
                            This file is auto-generated
                 see https://github.com/grodansparadis/vscp-classes
-                        Generated: 2020-02-19 17:52:50.955217
+                        Generated: 2020-02-20 23:04:25.097283
 */
  
 	m_hashClass[ 0 ] = _("CLASS1_PROTOCOL");
diff --git a/src/vscp/common/vscp_hashtype.h b/src/vscp/common/vscp_hashtype.h
index cc3de773d..8189dd03d 100644
--- a/src/vscp/common/vscp_hashtype.h
+++ b/src/vscp/common/vscp_hashtype.h
@@ -2,7 +2,7 @@
             !!!!!!!!!!!!!!!!!!!!  W A R N I N G  !!!!!!!!!!!!!!!!!!!!
                            This file is auto-generated
                 see https://github.com/grodansparadis/vscp-classes
-                        Generated: 2020-02-19 17:52:51.503163
+                        Generated: 2020-02-20 23:04:25.670093
 */
  
 
diff --git a/src/vscp/common/vscp_type.h b/src/vscp/common/vscp_type.h
index 0d4f85657..14f6fad7c 100644
--- a/src/vscp/common/vscp_type.h
+++ b/src/vscp/common/vscp_type.h
@@ -48,7 +48,7 @@
             !!!!!!!!!!!!!!!!!!!!  W A R N I N G  !!!!!!!!!!!!!!!!!!!!
                            This file is auto-generated
                 see https://github.com/grodansparadis/vscp-classes
-                        Generated: 2020-02-19 17:52:50.376925
+                        Generated: 2020-02-20 23:04:24.501111
 */
  
 #ifndef VSCP_TYPE_H