diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h
index 9c17d662..b5e4360c 100644
--- a/bacnet-stack/include/bacenum.h
+++ b/bacnet-stack/include/bacenum.h
@@ -1421,6 +1421,17 @@ typedef enum {
     NETWORK_MESSAGE_INVALID = 0x100
 } BACNET_NETWORK_MESSAGE_TYPE;
 
+typedef enum {
+    REINITIALIZED_STATE_COLD_START = 0,
+    REINITIALIZED_STATE_WARM_START = 1,
+    REINITIALIZED_STATE_START_BACKUP = 2,
+    REINITIALIZED_STATE_END_BACKUP = 3,
+    REINITIALIZED_STATE_START_RESTORE = 4,
+    REINITIALIZED_STATE_END_RESTORE = 5,
+    REINITIALIZED_STATE_ABORT_RESTORE = 6,
+    REINITIALIZED_STATE_IDLE = 255
+} BACNET_REINITIALIZED_STATE_OF_DEVICE;
+
 typedef enum {
     ABORT_REASON_OTHER = 0,
     ABORT_REASON_BUFFER_OVERFLOW = 1,
@@ -1431,6 +1442,8 @@ typedef enum {
     /* Enumerated values 64-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
     MAX_BACNET_ABORT_REASON = 5,
+    /* do the MAX here instead of outside of enum so that
+       compilers will allocate adequate sized datatype for enum */
     ABORT_REASON_PROPRIETARY_FIRST = 64,
     ABORT_REASON_PROPRIETARY_LAST = 65535
 } BACNET_ABORT_REASON;
@@ -1450,6 +1463,8 @@ typedef enum {
     /* Enumerated values 64-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
     MAX_BACNET_REJECT_REASON = 10,
+    /* do the MAX here instead of outside of enum so that
+       compilers will allocate adequate sized datatype for enum */
     REJECT_REASON_PROPRIETARY_FIRST = 64,
     REJECT_REASON_PROPRIETARY_LAST = 65535
 } BACNET_REJECT_REASON;
@@ -1466,6 +1481,9 @@ typedef enum {
     /* Enumerated values 0-63 are reserved for definition by ASHRAE. */
     /* Enumerated values 64-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
+    MAX_BACNET_ERROR_CLASS = 8,
+    /* do the MAX here instead of outside of enum so that
+       compilers will allocate adequate sized datatype for enum */
     ERROR_CLASS_PROPRIETARY_FIRST = 64,
     ERROR_CLASS_PROPRIETARY_LAST = 65535
 } BACNET_ERROR_CLASS;
@@ -1634,6 +1652,9 @@ typedef enum {
     ERROR_CODE_VALUE_TOO_LONG = 134,
     ERROR_CODE_ABORT_INSUFFICIENT_SECURITY = 135,
     ERROR_CODE_ABORT_SECURITY_ERROR = 136,
+
+    MAX_BACNET_ERROR_CODE = 137,
+
     /* Enumerated values 0-255 are reserved for definition by ASHRAE. */
     /* Enumerated values 256-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
diff --git a/bacnet-stack/include/bactext.h b/bacnet-stack/include/bactext.h
index 575115ac..997056f9 100644
--- a/bacnet-stack/include/bactext.h
+++ b/bacnet-stack/include/bactext.h
@@ -52,6 +52,10 @@ extern "C" {
     bool bactext_object_type_index(
         const char *search_name,
         unsigned *found_index);
+    const char *bactext_notify_type_name(
+        unsigned index);
+    const char *bactext_event_type_name(
+        unsigned index);
     const char *bactext_property_name(
         unsigned index);
     const char *bactext_property_name_default(
@@ -98,7 +102,8 @@ extern "C" {
         unsigned index);
     const char *bactext_node_type_name(
         unsigned index);
-
+    const char *bactext_character_string_encoding_name(
+        unsigned index);
     const char *bactext_event_transition_name(
         unsigned index);
     bool bactext_event_transition_index(