diff --git a/bacnet-stack/bactext.c b/bacnet-stack/bactext.c
index a2f1b59d..9d85278a 100644
--- a/bacnet-stack/bactext.c
+++ b/bacnet-stack/bactext.c
@@ -203,8 +203,14 @@ INDTEXT_DATA bacnet_object_type_names[] = {
     ,
     {OBJECT_ACCUMULATOR, "Accumulator"}
     ,
-    {OBJECT_PULSE_CONVERTER, "Pulse-Converter"}
-    ,
+    {OBJECT_PULSE_CONVERTER, "Pulse-Converter"},
+    
+    {OBJECT_EVENT_LOG, "Event-Log"},
+    {OBJECT_GLOBAL_GROUP, "Global-Group"},
+    {OBJECT_TREND_LOG_MULTIPLE, "Trend-Log-Multiple"},
+    {OBJECT_LOAD_CONTROL, "Load-Control"},
+    {OBJECT_STRUCTURED_VIEW, "Structured-View"},
+    
     {0, NULL}
 /* Enumerated values 0-127 are reserved for definition by ASHRAE.
    Enumerated values 128-1023 may be used by others subject to
@@ -563,64 +569,55 @@ INDTEXT_DATA bacnet_property_names[] = {
     {PROP_AUTO_SLAVE_DISCOVERY, "auto-slave-discovery"},
     {PROP_MANUAL_SLAVE_ADDRESS_BINDING, "manual-slave-address-binding"},
     {PROP_SLAVE_ADDRESS_BINDING, "slave-address-binding"},
-    {PROP_SLAVE_PROXY_ENABLE = 172,
-    PROP_LAST_NOTIFY_TIME = 173,
-    PROP_SCHEDULE_DEFAULT = 174,
-    PROP_ACCEPTED_MODES = 175,
-    PROP_ADJUST_VALUE = 176,
-    PROP_COUNT = 177,
-    PROP_COUNT_BEFORE_CHANGE = 178,
-    PROP_COUNT_CHANGE_TIME = 179,
-    PROP_COV_PERIOD = 180,
-    PROP_INPUT_REFERENCE = 181,
-    PROP_LIMIT_MONITORING_INTERVAL = 182,
-    PROP_LOGGING_DEVICE = 183,
-    PROP_LOGGING_RECORD = 184,
-    PROP_PRESCALE = 185,
-    PROP_PULSE_RATE = 186,
-    PROP_SCALE = 187,
-    PROP_SCALE_FACTOR = 188,
-    PROP_UPDATE_TIME = 189,
-    PROP_VALUE_BEFORE_CHANGE = 190,
-    PROP_VALUE_SET = 191,
-    PROP_VALUE_CHANGE_TIME = 192,
-    /* enumerations 212-225 are used in Addendum e to
-       ANSI/ASHRAE 135-2004 */
-    PROP_ALIGN_INTERVALS = 193,
-    PROP_GROUP_MEMBER_NAMES = 194,
-    PROP_INTERVAL_OFFSET = 195,
-    PROP_LAST_RESTART_REASON = 196,
-    PROP_LOGGING_TYPE = 197,
-    PROP_MEMBER_STATUS_FLAGS = 198,
-    PROP_NOTIFICATION_PERIOD = 199,
-    PROP_PREVIOUS_NOTIFY_RECORD = 200,
-    PROP_REQUESTED_UPDATE_INTERVAL = 201,
-    PROP_RESTART_NOTIFICATION_RECIPIENTS = 202,
-    PROP_TIME_OF_DEVICE_RESTART = 203,
-    PROP_TIME_SYNCHRONIZATION_INTERVAL = 204,
-    PROP_TRIGGER = 205,    
-    PROP_UTC_TIME_SYNCHRONIZATION_RECIPIENTS = 206,
-    /* enumerations 207-211 are used in Addendum d to 
-       ANSI/ASHRAE 135-2004 */
-    PROP_NODE_SUBTYPE = 207,
-    PROP_NODE_TYPE = 208,
-    PROP_STRUCTURED_OBJECT_LIST = 209,
-    PROP_SUBORDINATE_ANNOTATIONS = 210,
-    PROP_SUBORDINATE_LIST = 211,
-    /* enumerations 212-225 are used in Addendum e to 
-       ANSI/ASHRAE 135-2004 */
-    PROP_ACTUAL_SHED_LEVEL = 212,
-    PROP_DUTY_WINDOW = 213,
-    PROP_EXPECTED_SHED_LEVEL = 214,
-    PROP_FULL_DUTY_BASELINE = 215,
-    /* FIXME: is this the right enumeration? */
-    /* PROP_NODE_SUBTYPE = 216, */
-    /* PROP_NODE_TYPE = 217, */
-    PROP_REQUESTED_SHED_LEVEL = 218,
-    PROP_SHED_DURATION = 219,
-    PROP_SHED_LEVEL_DESCRIPTIONS = 220,
-    PROP_SHED_LEVELS = 221,
-    PROP_STATE_DESCRIPTION = 222,
+    {PROP_SLAVE_PROXY_ENABLE, "slave-proxy-enable"},
+    {PROP_LAST_NOTIFY_TIME, "last-notify-time"},
+    {PROP_SCHEDULE_DEFAULT, "schedule-default"},
+    {PROP_ACCEPTED_MODES, "accepted-modes"},
+    {PROP_ADJUST_VALUE, "adjust-value"},
+    {PROP_COUNT, "count"},
+    {PROP_COUNT_BEFORE_CHANGE, "count-before-change"},
+    {PROP_COUNT_CHANGE_TIME, "count-change-time"},
+    {PROP_COV_PERIOD, "COV-period"},
+    {PROP_INPUT_REFERENCE, "input-reference"},
+    {PROP_LIMIT_MONITORING_INTERVAL, "limit-monitoring-interval"},
+    {PROP_LOGGING_DEVICE, "logging-device"},
+    {PROP_LOGGING_RECORD, "logging-record"},
+    {PROP_PRESCALE, "prescale"},
+    {PROP_PULSE_RATE, "pulse-rate"},
+    {PROP_SCALE, "scale"},
+    {PROP_SCALE_FACTOR, "scale-factor"},
+    {PROP_UPDATE_TIME, "update-time"},
+    {PROP_VALUE_BEFORE_CHANGE, "value-before-change"},
+    {PROP_VALUE_SET, "value-set"},
+    {PROP_VALUE_CHANGE_TIME, "value-change-time"},
+    {PROP_ALIGN_INTERVALS, "align-intervals"},
+    {PROP_GROUP_MEMBER_NAMES, "group-member-names"},
+    {PROP_INTERVAL_OFFSET, "interval-offset"},
+    {PROP_LAST_RESTART_REASON, "last-restart-reason"},
+    {PROP_LOGGING_TYPE, "logging-type"},
+    {PROP_MEMBER_STATUS_FLAGS, "member-status-flags"},
+    {PROP_NOTIFICATION_PERIOD, "notification-period"},
+    {PROP_PREVIOUS_NOTIFY_RECORD, "previous-notify-record"},
+    {PROP_REQUESTED_UPDATE_INTERVAL, "requested-update-interval"},
+    {PROP_RESTART_NOTIFICATION_RECIPIENTS, "restart-notification-recipients"},
+    {PROP_TIME_OF_DEVICE_RESTART, "time-of-device-restart"},
+    {PROP_TIME_SYNCHRONIZATION_INTERVAL, "time-synchronization-interval"},
+    {PROP_TRIGGER, "trigger"},    
+    {PROP_UTC_TIME_SYNCHRONIZATION_RECIPIENTS, "UTC-time-synchronization-recipients"},
+    {PROP_NODE_SUBTYPE, "node-subtype"},
+    {PROP_NODE_TYPE, "node-type"},
+    {PROP_STRUCTURED_OBJECT_LIST, "structured-object-list"},
+    {PROP_SUBORDINATE_ANNOTATIONS, "subordinate-annotations"},
+    {PROP_SUBORDINATE_LIST, "subordinate-list"},
+    {PROP_ACTUAL_SHED_LEVEL, "actual-shed-level"},
+    {PROP_DUTY_WINDOW, "duty-window"},
+    {PROP_EXPECTED_SHED_LEVEL, "expected-shed-level"},
+    {PROP_FULL_DUTY_BASELINE, "full-duty-baseline"},
+    {PROP_REQUESTED_SHED_LEVEL, "requested-shed-level"},
+    {PROP_SHED_DURATION, "shed-duration"},
+    {PROP_SHED_LEVEL_DESCRIPTIONS, "shed-level-descriptions"},
+    {PROP_SHED_LEVELS, "shed-levels"},
+    {PROP_STATE_DESCRIPTION, "state-descriptions"},
 
     {0, NULL}
     /* Enumerated values 0-511 are reserved for definition by ASHRAE.