diff --git a/sys/configuration.h b/sys/configuration.h
index 5bde747..a89cd51 100644
--- a/sys/configuration.h
+++ b/sys/configuration.h
@@ -26,6 +26,10 @@
 #define OC_HEART_BEAT          1
 #define OC_EUID                2
 
+/* Possible options for configure_lwobject().
+ */
+#define LC_EUID                          0
+
 /* Possible options for configure_driver().
  */
 #define DC_MEMORY_LIMIT                  0
diff --git a/sys/driver_hook.h b/sys/driver_hook.h
index 8ca37c1..207ab19 100644
--- a/sys/driver_hook.h
+++ b/sys/driver_hook.h
@@ -30,8 +30,10 @@
 #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 NUM_DRIVER_HOOKS        26  /* Number of hooks */
+#define NUM_DRIVER_HOOKS        28  /* Number of hooks */
 
 #endif /* LPC_DRIVER_HOOK_ */
 
diff --git a/sys/interactive_info.h b/sys/interactive_info.h
index 920ac92..fcd662a 100644
--- a/sys/interactive_info.h
+++ b/sys/interactive_info.h
@@ -20,6 +20,8 @@
 #define II_INPUT_PENDING                -20
 #define II_EDITING                      -21
 #define II_IDLE                         -22
+#define II_NOECHO                       -23
+#define II_CHARMODE                     -24
 
 /* Output handling */
 #define II_SNOOP_NEXT                   -30
diff --git a/sys/lpctypes.h b/sys/lpctypes.h
index 50af876..504ba75 100644
--- a/sys/lpctypes.h
+++ b/sys/lpctypes.h
@@ -15,6 +15,8 @@
 #define TYPE_SYMBOL     9
 #define TYPE_QUOTED_ARRAY 10
 #define TYPE_STRUCT     11
+#define TYPE_BYTES      12
+#define TYPE_LWOBJECT   13
 
 #define TYPE_MOD_POINTER        0x0040  /* Pointer to a basic type        */
 
@@ -33,6 +35,7 @@
 #define T_QUOTED_ARRAY  0xa
 #define T_STRUCT        0xb
 #define T_BYTES         0xc
+#define T_LWOBJECT      0xd
 
 /* Closure types, stored as secondary type info */
 
diff --git a/sys/lwobject_info.h b/sys/lwobject_info.h
new file mode 100644
index 0000000..de7aecd
--- /dev/null
+++ b/sys/lwobject_info.h
@@ -0,0 +1,40 @@
+#ifndef LPC_LWOBJECT_INFO_H_
+#define LPC_LWOBJECT_INFO_H_
+
+/* Definition of argument values for lwobject_info()
+ */
+
+#include "configuration.h"
+
+/* LWOject info */
+#define LI_LWOBJECT_REFS                 -1
+#define LI_DATA_SIZE                     -2
+#define LI_DATA_SIZE_TOTAL               -3
+
+/* Program flags */
+#define LI_NO_INHERIT                   -10
+#define LI_NO_CLONE                     -11
+#define LI_NO_LIGHTWEIGHT               -12
+#define LI_SHARE_VARIABLES              -13
+
+/* Statistics about the program */
+#define LI_PROG_REFS                    -20
+
+#define LI_NUM_FUNCTIONS                -30
+#define LI_NUM_VARIABLES                -31
+#define LI_NUM_STRINGS                  -32
+#define LI_NUM_INHERITED                -33
+#define LI_NUM_INCLUDED                 -34
+
+#define LI_SIZE_FUNCTIONS               -35
+#define LI_SIZE_VARIABLES               -36
+#define LI_SIZE_STRINGS                 -37
+#define LI_SIZE_STRINGS_DATA            -38
+#define LI_SIZE_STRINGS_DATA_TOTAL      -39
+#define LI_SIZE_INHERITED               -40
+#define LI_SIZE_INCLUDED                -41
+
+#define LI_PROG_SIZE                    -42
+#define LI_PROG_SIZE_TOTAL              -43
+
+#endif /* LPC_LWOBJECT_INFO_H_ */
diff --git a/sys/object_info.h b/sys/object_info.h
index 2578747..db28541 100644
--- a/sys/object_info.h
+++ b/sys/object_info.h
@@ -18,6 +18,7 @@
 #define OI_NO_CLONE                     -11
 #define OI_NO_SHADOW                    -12
 #define OI_SHARE_VARIABLES              -13
+#define OI_NO_LIGHTWEIGHT               -14
 
 /* Swapping */
 #define OI_SWAPPED                      -20
diff --git a/sys/telnet.h b/sys/telnet.h
index 9950392..3b5b4be 100644
--- a/sys/telnet.h
+++ b/sys/telnet.h
@@ -103,7 +103,7 @@
 #define  TELOPT_AUTHENTICATION 37       /* authentication */
 #define  TELOPT_ENCRYPT       38        /* authentication */
 #define  TELOPT_NEWENV        39        /* Environment opt for Port ID */
-#define  TELOPT_CHARSET       42        /* Negotiate about charsets */
+#define  TELOPT_CHARSET       42        /* Character encoding negotiation */
 #define  TELOPT_STARTTLS      46        /* Transport Layer Security */
 #define  TELOPT_KERMIT        47        /* Telnet KERMIT */
 #define  TELOPT_SEND_URL      48        /* Send URL */
@@ -136,7 +136,7 @@
    , "TTYLOC", "3270 REGIME", "X.3 PAD", "NAWS"
    , "TSPEED", "LFLOW", "LINEMODE", "XDISPLOC"
    , "ENVIRON", "AUTH", "ENCRYPT", "NEWENV"
-   , "TELOPT 40", "TELOPT 41", "TELOPT 42", "TELOPT 43"
+   , "TELOPT 40", "TELOPT 41", "CHARSET", "TELOPT 43"
    , "TELOPT 44", "TELOPT 45", "STARTTLS", "KERMIT"
    , "SEND_URL", "TELOPT 49", "TELOPT 50", "TELOPT 51"
    , "TELOPT 52", "TELOPT 53", "TELOPT 54", "TELOPT 55"