diff --git a/sys/driver_hook.h b/sys/driver_hook.h
index 207ab19..67316e2 100644
--- a/sys/driver_hook.h
+++ b/sys/driver_hook.h
@@ -4,36 +4,39 @@
 /* --- Driver Hooks ---
  */
 
-#define H_MOVE_OBJECT0           0
-#define H_MOVE_OBJECT1           1
-#define H_LOAD_UIDS              2
-#define H_CLONE_UIDS             3
-#define H_CREATE_SUPER           4
-#define H_CREATE_OB              5
-#define H_CREATE_CLONE           6
-#define H_RESET                  7
-#define H_CLEAN_UP               8
-#define H_MODIFY_COMMAND         9
-#define H_NOTIFY_FAIL           10
-#define H_NO_IPC_SLOT           11
-#define H_INCLUDE_DIRS          12
-#define H_TELNET_NEG            13
-#define H_NOECHO                14
-#define H_ERQ_STOP              15
-#define H_MODIFY_COMMAND_FNAME  16
-#define H_COMMAND               17
-#define H_SEND_NOTIFY_FAIL      18
-#define H_AUTO_INCLUDE          19
-#define H_DEFAULT_METHOD        20
-#define H_DEFAULT_PROMPT        21
-#define H_PRINT_PROMPT          22
-#define H_REGEXP_PACKAGE        23
-#define H_MSG_DISCARDED         24
-#define H_FILE_ENCODING         25
-#define H_LWOBJECT_UIDS         26
-#define H_CREATE_LWOBJECT       27
+#define H_MOVE_OBJECT0               0
+#define H_MOVE_OBJECT1               1
+#define H_LOAD_UIDS                  2
+#define H_CLONE_UIDS                 3
+#define H_CREATE_SUPER               4
+#define H_CREATE_OB                  5
+#define H_CREATE_CLONE               6
+#define H_RESET                      7
+#define H_CLEAN_UP                   8
+#define H_MODIFY_COMMAND             9
+#define H_NOTIFY_FAIL               10
+#define H_NO_IPC_SLOT               11
+#define H_INCLUDE_DIRS              12
+#define H_TELNET_NEG                13
+#define H_NOECHO                    14
+#define H_ERQ_STOP                  15
+#define H_MODIFY_COMMAND_FNAME      16
+#define H_COMMAND                   17
+#define H_SEND_NOTIFY_FAIL          18
+#define H_AUTO_INCLUDE              19
+#define H_DEFAULT_METHOD            20
+#define H_DEFAULT_PROMPT            21
+#define H_PRINT_PROMPT              22
+#define H_REGEXP_PACKAGE            23
+#define H_MSG_DISCARDED             24
+#define H_FILE_ENCODING             25
+#define H_LWOBJECT_UIDS             26
+#define H_CREATE_LWOBJECT           27
+#define H_CREATE_LWOBJECT_COPY      28
+#define H_CREATE_LWOBJECT_RESTORE   29
+#define H_AUTO_INCLUDE_EXPRESSION   30
+#define H_AUTO_INCLUDE_BLOCK        31
 
-#define NUM_DRIVER_HOOKS        28  /* Number of hooks */
+#define NUM_DRIVER_HOOKS            32  /* Number of hooks */
 
 #endif /* LPC_DRIVER_HOOK_ */
-
diff --git a/sys/driver_info.h b/sys/driver_info.h
index 94a02fd..2959a8e 100644
--- a/sys/driver_info.h
+++ b/sys/driver_info.h
@@ -102,6 +102,12 @@
 #define DI_NUM_REGEX                                        -427
 #define DI_NUM_REGEX_TABLE_SLOTS                            -428
 #define DI_NUM_LVALUES                                      -429
+#define DI_NUM_NAMED_OBJECT_TYPES                           -430
+#define DI_NUM_NAMED_OBJECT_TYPES_TABLE_SLOTS               -431
+#define DI_NUM_LWOBJECTS                                    -432
+#define DI_NUM_COROUTINES                                   -433
+#define DI_NUM_LPC_PYTHON_REFS                              -434
+#define DI_NUM_PYTHON_LPC_REFS                              -435
 
 #define DI_SIZE_ACTIONS                                     -450
 #define DI_SIZE_CALLOUTS                                    -451
@@ -125,6 +131,9 @@
 #define DI_SIZE_REGEX                                       -469
 #define DI_SIZE_BUFFER_FILE                                 -470
 #define DI_SIZE_BUFFER_SWAP                                 -471
+#define DI_SIZE_NAMED_OBJECT_TYPES_TABLE                    -472
+#define DI_SIZE_LWOBJECTS                                   -473
+#define DI_SIZE_COROUTINES                                  -474
 
 /* Memory swapper statistics */
 #define DI_NUM_SWAP_BLOCKS                                  -500
@@ -188,6 +197,9 @@
 #define DI_STATUS_TEXT_MALLOC                               -703
 #define DI_STATUS_TEXT_MALLOC_EXTENDED                      -704
 
+/* Misc Status */
+#define DI_NUM_SIMUL_EFUNS_TABLED                           -900
+
 /* Indices into the subarrays of DI_MEMORY_EXTENDED_STATISTICS (if given) */
 
 #define DIM_ES_MAX_ALLOC   0
diff --git a/sys/functionlist.h b/sys/functionlist.h
index 61dcd64..db80505 100644
--- a/sys/functionlist.h
+++ b/sys/functionlist.h
@@ -31,7 +31,7 @@
 #define RETURN_FUNCTION_NAME	0x01
 #define RETURN_FUNCTION_FLAGS	0x02
 #define RETURN_FUNCTION_TYPE	0x04
-
+#define RETURN_FUNCTION_LPCTYPE	0x20
 
 /* Additional return value flag types for functionlist() */
 
@@ -45,8 +45,8 @@
 
 
 /* Masks of the flag unions allowed for various efuns: */
-#define RETURN_FUNCTION_MASK    0x0f  /* functionlist() */
-#define RETURN_VARIABLE_MASK    0x0f  /* variable_list() */
+#define RETURN_FUNCTION_MASK    0x2f  /* functionlist() */
+#define RETURN_VARIABLE_MASK    0x2f  /* variable_list() */
 
 /* Return value flag types for function_exists() */
 
diff --git a/sys/lpctypes.h b/sys/lpctypes.h
index 504ba75..2824fad 100644
--- a/sys/lpctypes.h
+++ b/sys/lpctypes.h
@@ -17,6 +17,8 @@
 #define TYPE_STRUCT     11
 #define TYPE_BYTES      12
 #define TYPE_LWOBJECT   13
+#define TYPE_COROUTINE  14
+#define TYPE_LPCTYPE    15
 
 #define TYPE_MOD_POINTER        0x0040  /* Pointer to a basic type        */
 
@@ -36,6 +38,9 @@
 #define T_STRUCT        0xb
 #define T_BYTES         0xc
 #define T_LWOBJECT      0xd
+#define T_COROUTINE     0xe
+#define T_PYTHON        0xf
+#define T_LPCTYPE       0x10
 
 /* Closure types, stored as secondary type info */