From 66d1110733b876f36459d1bf8655eb4013f39470 Mon Sep 17 00:00:00 2001
From: Sandu Liviu Catalin <slc.universe@gmail.com>
Date: Sun, 17 Jul 2016 03:24:07 +0300
Subject: [PATCH] Rvised the API distribution system to avoid segmentation
 fault crashes on Linux and make the overal code cleaner. Moved the constants
 in IRC module into their own source and implemented a faster method of
 registering them. Various other minor changes and adjustments. Some of them
 in order to comply with the new API distribution system.

---
 cbp/ModIRC.cbp                 |    1 +
 cbp/ModMySQL.cbp               |    2 +-
 cbp/Sandbox.cbp                |   16 +-
 modules/irc/Common.cpp         |   21 +-
 modules/irc/Constants.cpp      |  244 ++++++
 modules/irc/Module.cpp         |  446 ++---------
 modules/irc/Session.cpp        |  124 +++-
 modules/json/Common.cpp        |    2 +-
 modules/json/JArray.cpp        |    4 +-
 modules/json/JObject.cpp       |    4 +-
 modules/json/JValue.cpp        |    4 +-
 modules/json/Module.cpp        |  188 +++--
 modules/mg/Module.cpp          |  299 ++++----
 modules/mmdb/EntryDataList.cpp |    6 +-
 modules/mmdb/Module.cpp        |  143 ++--
 modules/mysql/Common.cpp       |   18 +-
 modules/mysql/Module.cpp       |  169 ++---
 modules/mysql/Parameter.hpp    |   36 +-
 modules/sample/Module.cpp      |  160 ++--
 modules/sqlite/Column.cpp      |   18 +-
 modules/sqlite/Common.cpp      |   12 +-
 modules/sqlite/Module.cpp      |  181 ++---
 modules/xml/Attribute.cpp      |   56 +-
 modules/xml/Module.cpp         |  311 ++++----
 modules/xml/Text.cpp           |   56 +-
 shared/Base/Utility.hpp        |   32 +-
 shared/Base/Utility.inl        |  141 +++-
 shared/SqAPI.h                 | 1104 ++++++++++++++++------------
 shared/SqMod.h                 |  288 ++++----
 shared/SqMod.inl               | 1266 ++++++++++++++++----------------
 source/Exports.cpp             |  469 ++++++------
 source/Main.cpp                |    1 -
 32 files changed, 3049 insertions(+), 2773 deletions(-)
 create mode 100644 modules/irc/Constants.cpp

diff --git a/cbp/ModIRC.cbp b/cbp/ModIRC.cbp
index 77e7857a..34f94b78 100644
--- a/cbp/ModIRC.cbp
+++ b/cbp/ModIRC.cbp
@@ -434,6 +434,7 @@
 		</Unit>
 		<Unit filename="../modules/irc/Common.cpp" />
 		<Unit filename="../modules/irc/Common.hpp" />
+		<Unit filename="../modules/irc/Constants.cpp" />
 		<Unit filename="../modules/irc/Module.cpp" />
 		<Unit filename="../modules/irc/Session.cpp" />
 		<Unit filename="../modules/irc/Session.hpp" />
diff --git a/cbp/ModMySQL.cbp b/cbp/ModMySQL.cbp
index 63ade63f..e96d46d2 100644
--- a/cbp/ModMySQL.cbp
+++ b/cbp/ModMySQL.cbp
@@ -114,9 +114,9 @@
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Compiler>
+					<Add option="-fPIC" />
 					<Add option="-m32" />
 					<Add option="-g" />
-					<Add option="-fPIC" />
 					<Add option="-D_DEBUG" />
 					<Add directory="../config/gcc32" />
 					<Add directory="/usr/include/mysql" />
diff --git a/cbp/Sandbox.cbp b/cbp/Sandbox.cbp
index ed2873f0..b4652521 100644
--- a/cbp/Sandbox.cbp
+++ b/cbp/Sandbox.cbp
@@ -91,11 +91,11 @@
 					<Add option="-m32" />
 					<Add option="-g" />
 					<Add option="-D_DEBUG" />
-					<Add directory="../config/mingw32" />
+					<Add directory="../config/gcc32" />
 				</Compiler>
 				<Linker>
 					<Add option="-m32" />
-					<Add directory="../lib/mingw32-d" />
+					<Add directory="../lib/gcc32-d" />
 				</Linker>
 			</Target>
 			<Target title="Linux32 Release Executable">
@@ -109,12 +109,12 @@
 					<Add option="-O3" />
 					<Add option="-m32" />
 					<Add option="-DNDEBUG" />
-					<Add directory="../config/mingw32" />
+					<Add directory="../config/gcc32" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add option="-m32" />
-					<Add directory="../lib/mingw32" />
+					<Add directory="../lib/gcc32" />
 				</Linker>
 			</Target>
 			<Target title="Linux64 Debug Executable">
@@ -128,11 +128,11 @@
 					<Add option="-m64" />
 					<Add option="-g" />
 					<Add option="-D_DEBUG" />
-					<Add directory="../config/mingw32" />
+					<Add directory="../config/gcc64" />
 				</Compiler>
 				<Linker>
 					<Add option="-m64" />
-					<Add directory="../lib/mingw32-d" />
+					<Add directory="../lib/gcc64-d" />
 				</Linker>
 			</Target>
 			<Target title="Linux64 Release Executable">
@@ -146,12 +146,12 @@
 					<Add option="-O3" />
 					<Add option="-m64" />
 					<Add option="-DNDEBUG" />
-					<Add directory="../config/mingw32" />
+					<Add directory="../config/gcc64" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add option="-m64" />
-					<Add directory="../lib/mingw32" />
+					<Add directory="../lib/gcc64" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/modules/irc/Common.cpp b/modules/irc/Common.cpp
index a74a751b..6b76fcdb 100644
--- a/modules/irc/Common.cpp
+++ b/modules/irc/Common.cpp
@@ -8,7 +8,7 @@
 namespace SqMod {
 
 // ------------------------------------------------------------------------------------------------
-SQInteger GetNick(HSQUIRRELVM vm)
+static SQInteger SqGetNick(HSQUIRRELVM vm)
 {
     // Attempt to retrieve the value from the stack as a string
     StackStrF val(vm, 2);
@@ -26,7 +26,7 @@ SQInteger GetNick(HSQUIRRELVM vm)
 }
 
 // ------------------------------------------------------------------------------------------------
-SQInteger GetHost(HSQUIRRELVM vm)
+static SQInteger SqGetHost(HSQUIRRELVM vm)
 {
     // Attempt to retrieve the value from the stack as a string
     StackStrF val(vm, 2);
@@ -44,7 +44,7 @@ SQInteger GetHost(HSQUIRRELVM vm)
 }
 
 // ------------------------------------------------------------------------------------------------
-SQInteger StripColorFromMIRC(HSQUIRRELVM vm)
+static SQInteger SqStripColorFromMIRC(HSQUIRRELVM vm)
 {
     // Attempt to retrieve the value from the stack as a string
     StackStrF val(vm, 2);
@@ -69,7 +69,7 @@ SQInteger StripColorFromMIRC(HSQUIRRELVM vm)
 }
 
 // ------------------------------------------------------------------------------------------------
-SQInteger ConvertColorFromMIRC(HSQUIRRELVM vm)
+static SQInteger SqConvertColorFromMIRC(HSQUIRRELVM vm)
 {
     // Attempt to retrieve the value from the stack as a string
     StackStrF val(vm, 2);
@@ -94,7 +94,7 @@ SQInteger ConvertColorFromMIRC(HSQUIRRELVM vm)
 }
 
 // ------------------------------------------------------------------------------------------------
-SQInteger ConvertColorToMIRC(HSQUIRRELVM vm)
+static SQInteger SqConvertColorToMIRC(HSQUIRRELVM vm)
 {
     // Attempt to retrieve the value from the stack as a string
     StackStrF val(vm, 2);
@@ -118,4 +118,15 @@ SQInteger ConvertColorToMIRC(HSQUIRRELVM vm)
     return 1;
 }
 
+// ================================================================================================
+void Register_Common(Table & ircns)
+{
+    ircns.Func(_SC("GetErrStr"), &irc_strerror);
+    ircns.SquirrelFunc(_SC("GetNick"), &SqGetNick);
+    ircns.SquirrelFunc(_SC("GetHost"), &SqGetHost);
+    ircns.SquirrelFunc(_SC("StripColorFromMIRC"), &SqStripColorFromMIRC);
+    ircns.SquirrelFunc(_SC("ConvertColorFromMIRC"), &SqConvertColorFromMIRC);
+    ircns.SquirrelFunc(_SC("ConvertColorToMIRC"), &SqConvertColorToMIRC);
+}
+
 } // Namespace:: SqMod
diff --git a/modules/irc/Constants.cpp b/modules/irc/Constants.cpp
new file mode 100644
index 00000000..84c18084
--- /dev/null
+++ b/modules/irc/Constants.cpp
@@ -0,0 +1,244 @@
+// ------------------------------------------------------------------------------------------------
+#include "Common.hpp"
+
+// ------------------------------------------------------------------------------------------------
+namespace SqMod {
+
+/* ------------------------------------------------------------------------------------------------
+ * Helper class that represents an integral enumeration value. Used to reduce compilation times.
+*/
+struct EnumElement
+{
+    CSStr Name;
+    Int32 Value;
+};
+
+// ------------------------------------------------------------------------------------------------
+#define SQENUMCOUNT(arr) (sizeof(arr) / sizeof(EnumElement))
+
+// ------------------------------------------------------------------------------------------------
+static const EnumElement g_IrcEvent[] = {
+    {_SC("Connect"),                                SET_CONNECT},
+    {_SC("Nick"),                                   SET_NICK},
+    {_SC("Quit"),                                   SET_QUIT},
+    {_SC("Join"),                                   SET_JOIN},
+    {_SC("Part"),                                   SET_PART},
+    {_SC("Mode"),                                   SET_MODE},
+    {_SC("Umode"),                                  SET_UMODE},
+    {_SC("Topic"),                                  SET_TOPIC},
+    {_SC("Kick"),                                   SET_KICK},
+    {_SC("Channel"),                                SET_CHANNEL},
+    {_SC("PrivMsg"),                                SET_PRIVMSG},
+    {_SC("Notice"),                                 SET_NOTICE},
+    {_SC("ChannelNotice"),                          SET_CHANNELNOTICE},
+    {_SC("Invite"),                                 SET_INVITE},
+    {_SC("CtcpReq"),                                SET_CTCPREQ},
+    {_SC("CtcpRep"),                                SET_CTCPREP},
+    {_SC("CtcpAction"),                             SET_CTCPACTION},
+    {_SC("Unknown"),                                SET_UNKNOWN},
+    {_SC("Numeric"),                                SET_NUMERIC},
+    {_SC("DccChatReq"),                             SET_DCCCHATREQ},
+    {_SC("DccSendReq"),                             SET_DCCSENDREQ}
+};
+
+// ------------------------------------------------------------------------------------------------
+static const EnumElement g_IrcErr[] = {
+    {_SC("Ok"),                                     LIBIRC_ERR_OK},
+    {_SC("InVal"),                                  LIBIRC_ERR_INVAL},
+    {_SC("Resolv"),                                 LIBIRC_ERR_RESOLV},
+    {_SC("Socket"),                                 LIBIRC_ERR_SOCKET},
+    {_SC("Connect"),                                LIBIRC_ERR_CONNECT},
+    {_SC("Closed"),                                 LIBIRC_ERR_CLOSED},
+    {_SC("NoMem"),                                  LIBIRC_ERR_NOMEM},
+    {_SC("Accept"),                                 LIBIRC_ERR_ACCEPT},
+    {_SC("NoDccSend"),                              LIBIRC_ERR_NODCCSEND},
+    {_SC("Read"),                                   LIBIRC_ERR_READ},
+    {_SC("Write"),                                  LIBIRC_ERR_WRITE},
+    {_SC("State"),                                  LIBIRC_ERR_STATE},
+    {_SC("Timeout"),                                LIBIRC_ERR_TIMEOUT},
+    {_SC("OpenFile"),                               LIBIRC_ERR_OPENFILE},
+    {_SC("Terminated"),                             LIBIRC_ERR_TERMINATED},
+    {_SC("NoIPv6"),                                 LIBIRC_ERR_NOIPV6},
+    {_SC("SSLNotSupported"),                        LIBIRC_ERR_SSL_NOT_SUPPORTED},
+    {_SC("SSLInitFailed"),                          LIBIRC_ERR_SSL_INIT_FAILED},
+    {_SC("ConnectSSLFailed"),                       LIBIRC_ERR_CONNECT_SSL_FAILED},
+    {_SC("SSLCertVerifyFailed"),                    LIBIRC_ERR_SSL_CERT_VERIFY_FAILED},
+    {_SC("Max"),                                    LIBIRC_ERR_MAX}
+};
+
+// ------------------------------------------------------------------------------------------------
+static const EnumElement g_IrcOpt[] = {
+    {_SC("Debug"),                                  LIBIRC_OPTION_DEBUG},
+    {_SC("StripNicks"),                             LIBIRC_OPTION_STRIPNICKS},
+    {_SC("SSLNoVerify"),                            LIBIRC_OPTION_SSL_NO_VERIFY}
+
+};
+
+// ------------------------------------------------------------------------------------------------
+static const EnumElement g_IrcRFC[] = {
+
+    {_SC("RPL_WELCOME"),                            LIBIRC_RFC_RPL_WELCOME},
+    {_SC("RPL_YOURHOST"),                           LIBIRC_RFC_RPL_YOURHOST},
+    {_SC("RPL_CREATED"),                            LIBIRC_RFC_RPL_CREATED},
+    {_SC("RPL_MYINFO"),                             LIBIRC_RFC_RPL_MYINFO},
+    {_SC("RPL_BOUNCE"),                             LIBIRC_RFC_RPL_BOUNCE},
+    {_SC("RPL_NONE"),                               LIBIRC_RFC_RPL_NONE},
+    {_SC("RPL_USERHOST"),                           LIBIRC_RFC_RPL_USERHOST},
+    {_SC("RPL_ISON"),                               LIBIRC_RFC_RPL_ISON},
+    {_SC("RPL_AWAY"),                               LIBIRC_RFC_RPL_AWAY},
+    {_SC("RPL_UNAWAY"),                             LIBIRC_RFC_RPL_UNAWAY},
+    {_SC("RPL_NOWAWAY"),                            LIBIRC_RFC_RPL_NOWAWAY},
+    {_SC("RPL_WHOISUSER"),                          LIBIRC_RFC_RPL_WHOISUSER},
+    {_SC("RPL_WHOISSERVER"),                        LIBIRC_RFC_RPL_WHOISSERVER},
+    {_SC("RPL_WHOISOPERATOR"),                      LIBIRC_RFC_RPL_WHOISOPERATOR},
+    {_SC("RPL_WHOISIDLE"),                          LIBIRC_RFC_RPL_WHOISIDLE},
+    {_SC("RPL_ENDOFWHOIS"),                         LIBIRC_RFC_RPL_ENDOFWHOIS},
+    {_SC("RPL_WHOISCHANNELS"),                      LIBIRC_RFC_RPL_WHOISCHANNELS},
+    {_SC("RPL_WHOWASUSER"),                         LIBIRC_RFC_RPL_WHOWASUSER},
+    {_SC("RPL_ENDOFWHOWAS"),                        LIBIRC_RFC_RPL_ENDOFWHOWAS},
+    {_SC("RPL_LISTSTART"),                          LIBIRC_RFC_RPL_LISTSTART},
+    {_SC("RPL_LIST"),                               LIBIRC_RFC_RPL_LIST},
+    {_SC("RPL_LISTEND"),                            LIBIRC_RFC_RPL_LISTEND},
+    {_SC("RPL_UNIQOPIS"),                           LIBIRC_RFC_RPL_UNIQOPIS},
+    {_SC("RPL_CHANNELMODEIS"),                      LIBIRC_RFC_RPL_CHANNELMODEIS},
+    {_SC("RPL_NOTOPIC"),                            LIBIRC_RFC_RPL_NOTOPIC},
+    {_SC("RPL_TOPIC"),                              LIBIRC_RFC_RPL_TOPIC},
+    {_SC("RPL_INVITING"),                           LIBIRC_RFC_RPL_INVITING},
+    {_SC("RPL_SUMMONING"),                          LIBIRC_RFC_RPL_SUMMONING},
+    {_SC("RPL_INVITELIST"),                         LIBIRC_RFC_RPL_INVITELIST},
+    {_SC("RPL_ENDOFINVITELIST"),                    LIBIRC_RFC_RPL_ENDOFINVITELIST},
+    {_SC("RPL_EXCEPTLIST"),                         LIBIRC_RFC_RPL_EXCEPTLIST},
+    {_SC("RPL_ENDOFEXCEPTLIST"),                    LIBIRC_RFC_RPL_ENDOFEXCEPTLIST},
+    {_SC("RPL_VERSION"),                            LIBIRC_RFC_RPL_VERSION},
+    {_SC("RPL_WHOREPLY"),                           LIBIRC_RFC_RPL_WHOREPLY},
+    {_SC("RPL_ENDOFWHO"),                           LIBIRC_RFC_RPL_ENDOFWHO},
+    {_SC("RPL_NAMREPLY"),                           LIBIRC_RFC_RPL_NAMREPLY},
+    {_SC("RPL_ENDOFNAMES"),                         LIBIRC_RFC_RPL_ENDOFNAMES},
+    {_SC("RPL_LINKS"),                              LIBIRC_RFC_RPL_LINKS},
+    {_SC("RPL_ENDOFLINKS"),                         LIBIRC_RFC_RPL_ENDOFLINKS},
+    {_SC("RPL_BANLIST"),                            LIBIRC_RFC_RPL_BANLIST},
+    {_SC("RPL_ENDOFBANLIST"),                       LIBIRC_RFC_RPL_ENDOFBANLIST},
+    {_SC("RPL_INFO"),                               LIBIRC_RFC_RPL_INFO},
+    {_SC("RPL_ENDOFINFO"),                          LIBIRC_RFC_RPL_ENDOFINFO},
+    {_SC("RPL_MOTDSTART"),                          LIBIRC_RFC_RPL_MOTDSTART},
+    {_SC("RPL_MOTD"),                               LIBIRC_RFC_RPL_MOTD},
+    {_SC("RPL_ENDOFMOTD"),                          LIBIRC_RFC_RPL_ENDOFMOTD},
+    {_SC("RPL_YOUREOPER"),                          LIBIRC_RFC_RPL_YOUREOPER},
+    {_SC("RPL_REHASHING"),                          LIBIRC_RFC_RPL_REHASHING},
+    {_SC("RPL_YOURESERVICE"),                       LIBIRC_RFC_RPL_YOURESERVICE},
+    {_SC("RPL_TIME"),                               LIBIRC_RFC_RPL_TIME},
+    {_SC("RPL_USERSSTART"),                         LIBIRC_RFC_RPL_USERSSTART},
+    {_SC("RPL_USERS"),                              LIBIRC_RFC_RPL_USERS},
+    {_SC("RPL_ENDOFUSERS"),                         LIBIRC_RFC_RPL_ENDOFUSERS},
+    {_SC("RPL_NOUSERS"),                            LIBIRC_RFC_RPL_NOUSERS},
+    {_SC("RPL_TRACELINK"),                          LIBIRC_RFC_RPL_TRACELINK},
+    {_SC("RPL_TRACECONNECTING"),                    LIBIRC_RFC_RPL_TRACECONNECTING},
+    {_SC("RPL_TRACEHANDSHAKE"),                     LIBIRC_RFC_RPL_TRACEHANDSHAKE},
+    {_SC("RPL_TRACEUNKNOWN"),                       LIBIRC_RFC_RPL_TRACEUNKNOWN},
+    {_SC("RPL_TRACEOPERATOR"),                      LIBIRC_RFC_RPL_TRACEOPERATOR},
+    {_SC("RPL_TRACEUSER"),                          LIBIRC_RFC_RPL_TRACEUSER},
+    {_SC("RPL_TRACESERVER"),                        LIBIRC_RFC_RPL_TRACESERVER},
+    {_SC("RPL_TRACESERVICE"),                       LIBIRC_RFC_RPL_TRACESERVICE},
+    {_SC("RPL_TRACENEWTYPE"),                       LIBIRC_RFC_RPL_TRACENEWTYPE},
+    {_SC("RPL_TRACECLASS"),                         LIBIRC_RFC_RPL_TRACECLASS},
+    {_SC("RPL_TRACELOG"),                           LIBIRC_RFC_RPL_TRACELOG},
+    {_SC("RPL_TRACEEND"),                           LIBIRC_RFC_RPL_TRACEEND},
+    {_SC("RPL_STATSLINKINFO"),                      LIBIRC_RFC_RPL_STATSLINKINFO},
+    {_SC("RPL_STATSCOMMANDS"),                      LIBIRC_RFC_RPL_STATSCOMMANDS},
+    {_SC("RPL_ENDOFSTATS"),                         LIBIRC_RFC_RPL_ENDOFSTATS},
+    {_SC("RPL_STATSUPTIME"),                        LIBIRC_RFC_RPL_STATSUPTIME},
+    {_SC("RPL_STATSOLINE"),                         LIBIRC_RFC_RPL_STATSOLINE},
+    {_SC("RPL_UMODEIS"),                            LIBIRC_RFC_RPL_UMODEIS},
+    {_SC("RPL_SERVLIST"),                           LIBIRC_RFC_RPL_SERVLIST},
+    {_SC("RPL_SERVLISTEND"),                        LIBIRC_RFC_RPL_SERVLISTEND},
+    {_SC("RPL_LUSERCLIENT"),                        LIBIRC_RFC_RPL_LUSERCLIENT},
+    {_SC("RPL_LUSEROP"),                            LIBIRC_RFC_RPL_LUSEROP},
+    {_SC("RPL_LUSERUNKNOWN"),                       LIBIRC_RFC_RPL_LUSERUNKNOWN},
+    {_SC("RPL_LUSERCHANNELS"),                      LIBIRC_RFC_RPL_LUSERCHANNELS},
+    {_SC("RPL_LUSERME"),                            LIBIRC_RFC_RPL_LUSERME},
+    {_SC("RPL_ADMINME"),                            LIBIRC_RFC_RPL_ADMINME},
+    {_SC("RPL_ADMINLOC1"),                          LIBIRC_RFC_RPL_ADMINLOC1},
+    {_SC("RPL_ADMINLOC2"),                          LIBIRC_RFC_RPL_ADMINLOC2},
+    {_SC("RPL_ADMINEMAIL"),                         LIBIRC_RFC_RPL_ADMINEMAIL},
+    {_SC("RPL_TRYAGAIN"),                           LIBIRC_RFC_RPL_TRYAGAIN},
+    {_SC("ERR_NOSUCHNICK"),                         LIBIRC_RFC_ERR_NOSUCHNICK},
+    {_SC("ERR_NOSUCHSERVER"),                       LIBIRC_RFC_ERR_NOSUCHSERVER},
+    {_SC("ERR_NOSUCHCHANNEL"),                      LIBIRC_RFC_ERR_NOSUCHCHANNEL},
+    {_SC("ERR_CANNOTSENDTOCHAN"),                   LIBIRC_RFC_ERR_CANNOTSENDTOCHAN},
+    {_SC("ERR_TOOMANYCHANNELS"),                    LIBIRC_RFC_ERR_TOOMANYCHANNELS},
+    {_SC("ERR_WASNOSUCHNICK"),                      LIBIRC_RFC_ERR_WASNOSUCHNICK},
+    {_SC("ERR_TOOMANYTARGETS"),                     LIBIRC_RFC_ERR_TOOMANYTARGETS},
+    {_SC("ERR_NOSUCHSERVICE"),                      LIBIRC_RFC_ERR_NOSUCHSERVICE},
+    {_SC("ERR_NOORIGIN"),                           LIBIRC_RFC_ERR_NOORIGIN},
+    {_SC("ERR_NORECIPIENT"),                        LIBIRC_RFC_ERR_NORECIPIENT},
+    {_SC("ERR_NOTEXTTOSEND"),                       LIBIRC_RFC_ERR_NOTEXTTOSEND},
+    {_SC("ERR_NOTOPLEVEL"),                         LIBIRC_RFC_ERR_NOTOPLEVEL},
+    {_SC("ERR_WILDTOPLEVEL"),                       LIBIRC_RFC_ERR_WILDTOPLEVEL},
+    {_SC("ERR_BADMASK"),                            LIBIRC_RFC_ERR_BADMASK},
+    {_SC("ERR_UNKNOWNCOMMAND"),                     LIBIRC_RFC_ERR_UNKNOWNCOMMAND},
+    {_SC("ERR_NOMOTD"),                             LIBIRC_RFC_ERR_NOMOTD},
+    {_SC("ERR_NOADMININFO"),                        LIBIRC_RFC_ERR_NOADMININFO},
+    {_SC("ERR_FILEERROR"),                          LIBIRC_RFC_ERR_FILEERROR},
+    {_SC("ERR_NONICKNAMEGIVEN"),                    LIBIRC_RFC_ERR_NONICKNAMEGIVEN},
+    {_SC("ERR_ERRONEUSNICKNAME"),                   LIBIRC_RFC_ERR_ERRONEUSNICKNAME},
+    {_SC("ERR_NICKNAMEINUSE"),                      LIBIRC_RFC_ERR_NICKNAMEINUSE},
+    {_SC("ERR_NICKCOLLISION"),                      LIBIRC_RFC_ERR_NICKCOLLISION},
+    {_SC("ERR_UNAVAILRESOURCE"),                    LIBIRC_RFC_ERR_UNAVAILRESOURCE},
+    {_SC("ERR_USERNOTINCHANNEL"),                   LIBIRC_RFC_ERR_USERNOTINCHANNEL},
+    {_SC("ERR_NOTONCHANNEL"),                       LIBIRC_RFC_ERR_NOTONCHANNEL},
+    {_SC("ERR_USERONCHANNEL"),                      LIBIRC_RFC_ERR_USERONCHANNEL},
+    {_SC("ERR_NOLOGIN"),                            LIBIRC_RFC_ERR_NOLOGIN},
+    {_SC("ERR_SUMMONDISABLED"),                     LIBIRC_RFC_ERR_SUMMONDISABLED},
+    {_SC("ERR_USERSDISABLED"),                      LIBIRC_RFC_ERR_USERSDISABLED},
+    {_SC("ERR_NOTREGISTERED"),                      LIBIRC_RFC_ERR_NOTREGISTERED},
+    {_SC("ERR_NEEDMOREPARAMS"),                     LIBIRC_RFC_ERR_NEEDMOREPARAMS},
+    {_SC("ERR_ALREADYREGISTRED"),                   LIBIRC_RFC_ERR_ALREADYREGISTRED},
+    {_SC("ERR_NOPERMFORHOST"),                      LIBIRC_RFC_ERR_NOPERMFORHOST},
+    {_SC("ERR_PASSWDMISMATCH"),                     LIBIRC_RFC_ERR_PASSWDMISMATCH},
+    {_SC("ERR_YOUREBANNEDCREEP"),                   LIBIRC_RFC_ERR_YOUREBANNEDCREEP},
+    {_SC("ERR_YOUWILLBEBANNED"),                    LIBIRC_RFC_ERR_YOUWILLBEBANNED},
+    {_SC("ERR_KEYSET"),                             LIBIRC_RFC_ERR_KEYSET},
+    {_SC("ERR_CHANNELISFULL"),                      LIBIRC_RFC_ERR_CHANNELISFULL},
+    {_SC("ERR_UNKNOWNMODE"),                        LIBIRC_RFC_ERR_UNKNOWNMODE},
+    {_SC("ERR_INVITEONLYCHAN"),                     LIBIRC_RFC_ERR_INVITEONLYCHAN},
+    {_SC("ERR_BANNEDFROMCHAN"),                     LIBIRC_RFC_ERR_BANNEDFROMCHAN},
+    {_SC("ERR_BADCHANNELKEY"),                      LIBIRC_RFC_ERR_BADCHANNELKEY},
+    {_SC("ERR_BADCHANMASK"),                        LIBIRC_RFC_ERR_BADCHANMASK},
+    {_SC("ERR_NOCHANMODES"),                        LIBIRC_RFC_ERR_NOCHANMODES},
+    {_SC("ERR_BANLISTFULL"),                        LIBIRC_RFC_ERR_BANLISTFULL},
+    {_SC("ERR_NOPRIVILEGES"),                       LIBIRC_RFC_ERR_NOPRIVILEGES},
+    {_SC("ERR_CHANOPRIVSNEEDED"),                   LIBIRC_RFC_ERR_CHANOPRIVSNEEDED},
+    {_SC("ERR_CANTKILLSERVER"),                     LIBIRC_RFC_ERR_CANTKILLSERVER},
+    {_SC("ERR_RESTRICTED"),                         LIBIRC_RFC_ERR_RESTRICTED},
+    {_SC("ERR_UNIQOPPRIVSNEEDED"),                  LIBIRC_RFC_ERR_UNIQOPPRIVSNEEDED},
+    {_SC("ERR_NOOPERHOST"),                         LIBIRC_RFC_ERR_NOOPERHOST},
+    {_SC("ERR_UMODEUNKNOWNFLAG"),                   LIBIRC_RFC_ERR_UMODEUNKNOWNFLAG},
+    {_SC("ERR_USERSDONTMATCH"),                     LIBIRC_RFC_ERR_USERSDONTMATCH}
+};
+
+// ------------------------------------------------------------------------------------------------
+static Enumeration RegisterEnum(HSQUIRRELVM vm, CSStr name, const EnumElement * data, Uint32 count)
+{
+    // Allocate an empty enumeration
+    Enumeration e(vm);
+    // Register the values from the received data
+    for (Uint32 n = 0; n < count; ++n, ++data)
+    {
+        e.Const(data->Name, data->Value);
+    }
+    // Bind the enumeration to the constant table
+    ConstTable(vm).Enum(name, e);
+    // Return the enumeration for further changes if necessary
+    return e;
+}
+
+// ================================================================================================
+void Register_Constants(Table & ircns)
+{
+    RegisterEnum(ircns.GetVM(), _SC("SqIrcEvent"),      g_IrcEvent,     SQENUMCOUNT(g_IrcEvent));
+    RegisterEnum(ircns.GetVM(), _SC("SqIrcErr"),        g_IrcErr,       SQENUMCOUNT(g_IrcErr));
+    RegisterEnum(ircns.GetVM(), _SC("SqIrcOpt"),        g_IrcOpt,       SQENUMCOUNT(g_IrcOpt));
+    RegisterEnum(ircns.GetVM(), _SC("SqIrcRFC"),        g_IrcRFC,       SQENUMCOUNT(g_IrcRFC));
+}
+
+} // Namespace:: SqMod
\ No newline at end of file
diff --git a/modules/irc/Module.cpp b/modules/irc/Module.cpp
index 48cd0420..528f6618 100644
--- a/modules/irc/Module.cpp
+++ b/modules/irc/Module.cpp
@@ -1,6 +1,5 @@
 // ------------------------------------------------------------------------------------------------
 #include "Common.hpp"
-#include "Session.hpp"
 
 // ------------------------------------------------------------------------------------------------
 #include <cstdio>
@@ -14,68 +13,83 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
-/* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
-*/
-void RegisterAPI(HSQUIRRELVM vm);
+// ------------------------------------------------------------------------------------------------
+extern void SessionProcess();
+extern void SessionTerminate();
+
+// ------------------------------------------------------------------------------------------------
+extern void Register_Common(Table & ircns);
+extern void Register_Session(Table & ircns);
+extern void Register_Constants(Table & ircns);
 
 /* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
+ * Register the module API under the obtained virtual machine.
 */
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQIRC_NAME);
-    }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQIRC_NAME);
+        // Registration failed
+        return false;
     }
+
+    Table ircns;
+
+    Register_Common(ircns);
+    Register_Session(ircns);
+    Register_Constants(ircns);
+
+    RootTable().Bind(_SC("SqIRC"), ircns);
+
+    // Registration was successful
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * Load the module on the virtual machine provided by the host module.
 */
-void OnSquirrelLoad()
+static bool OnSquirrelLoad()
 {
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
     {
-        return; // Unable to proceed!
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQIRC_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
     // Make sure that a valid virtual machine exists
-    if (!_SqVM)
+    if (!DefaultVM::Get())
     {
-        return; // Unable to proceed!
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQIRC_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
     // Prevent common null objects from using dead virtual machines
     NullArray() = Array();
     NullTable() = Table();
     NullObject() = Object();
     NullFunction() = Function();
     // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQIRC_NAME);
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQIRC_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machine is about to be terminated and script resources should be released.
 */
-void OnSquirrelTerminate()
+static void OnSquirrelTerminate()
 {
     OutputMessage("Terminating: %s", SQIRC_NAME);
     // Release null objects just in case
@@ -88,31 +102,12 @@ void OnSquirrelTerminate()
 /* ------------------------------------------------------------------------------------------------
  * The virtual machined was closed and all memory associated with it was released.
 */
-void OnSquirrelReleased()
+static void OnSquirrelReleased()
 {
     // Release the current virtual machine, if any
     DefaultVM::Set(nullptr);
     // Terminate all sessions, if any
-    Session::Terminate();
-}
-
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQIRC_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
+    SessionTerminate();
 }
 
 /* ------------------------------------------------------------------------------------------------
@@ -123,20 +118,33 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
     switch(command_identifier)
     {
         case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
+        {
+            if (CheckModuleAPIVer(message, SQIRC_NAME))
             {
-                OnSquirrelInitialize();
+                try
+                {
+                    ImportModuleAPI(_Func, SQIRC_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
             }
-        break;
+        } break;
         case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
+        {
+            return OnSquirrelLoad();
+        } break;
         case SQMOD_TERMINATE_CMD:
+        {
             OnSquirrelTerminate();
-        break;
+        } break;
         case SQMOD_RELEASED_CMD:
+        {
             OnSquirrelReleased();
-        break;
+        } break;
         default: break;
     }
     return 1;
@@ -147,9 +155,12 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
 */
 static uint8_t OnServerInitialise()
 {
-    return 1;
+    return 1; // Initialization was successful
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
 static void OnServerShutdown(void)
 {
     // The server may still send callbacks
@@ -164,297 +175,7 @@ static void OnServerShutdown(void)
 */
 static void OnServerFrame(float /*delta*/)
 {
-    // Update the sessions and pool for events
-    Session::Process();
-}
-
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    Table ircns(vm);
-
-    ircns.Bind(_SC("Session"), Class< Session, NoCopy< Session > >(vm, _SC("SqIrcSession"))
-        // Constructors
-        .Ctor()
-        // Core Meta-methods
-        .Func(_SC("_cmp"), &Session::Cmp)
-        .SquirrelFunc(_SC("_typename"), &Session::Typename)
-        .Func(_SC("_tostring"), &Session::ToString)
-        // Properties
-        .Prop(_SC("Valid"), &Session::IsValid)
-        .Prop(_SC("Connected"), &Session::IsConnected)
-        .Prop(_SC("Tag"), &Session::GetTag, &Session::SetTag)
-        .Prop(_SC("Data"), &Session::GetData, &Session::SetData)
-        .Prop(_SC("Server"), &Session::GetServer, &Session::SetServer)
-        .Prop(_SC("Password"), &Session::GetPassword, &Session::SetPassword)
-        .Prop(_SC("Nick"), &Session::GetNick, &Session::SetNick)
-        .Prop(_SC("User"), &Session::GetUser, &Session::SetUser)
-        .Prop(_SC("Name"), &Session::GetName, &Session::SetName)
-        .Prop(_SC("Port"), &Session::GetPort, &Session::SetPort)
-        .Prop(_SC("PoolTime"), &Session::GetPoolTime, &Session::SetPoolTime)
-        .Prop(_SC("LastCode"), &Session::GetLastCode)
-        .Prop(_SC("Tries"), &Session::GetTries, &Session::SetTries)
-        .Prop(_SC("Wait"), &Session::GetWait, &Session::SetWait)
-        .Prop(_SC("LeftTries"), &Session::GetLeftTries, &Session::SetLeftTries)
-        .Prop(_SC("NextTry"), &Session::GetNextTry, &Session::SetNextTry)
-        .Prop(_SC("SessionTime"), &Session::GetSessionTime)
-        .Prop(_SC("Reconnecting"), &Session::GetReconnect)
-        .Prop(_SC("IPv6"), &Session::GetIPv6)
-        .Prop(_SC("CtcpVersion"), (void (Session::*)(void))(nullptr), &Session::SetCtcpVersion)
-        .Prop(_SC("ErrNo"), &Session::GetErrNo)
-        .Prop(_SC("ErrStr"), &Session::GetErrStr)
-        // Member Methods
-        .Func(_SC("Bind"), &Session::BindEvent)
-        .Func(_SC("GetEvent"), &Session::GetEvent)
-        .Func(_SC("Disconnect"), &Session::Disconnect)
-        .Func(_SC("CmdPart"), &Session::CmdPart)
-        .Func(_SC("CmdInvite"), &Session::CmdInvite)
-        .Func(_SC("CmdNames"), &Session::CmdNames)
-        .Func(_SC("CmdMsg"), &Session::CmdMsg)
-        .Func(_SC("CmdMe"), &Session::CmdMe)
-        .Func(_SC("CmdNotice"), &Session::CmdNotice)
-        .Func(_SC("CmdCtcpRequest"), &Session::CmdCtcpRequest)
-        .Func(_SC("CmdCtcpReply"), &Session::CmdCtcpReply)
-        .Func(_SC("CmdNick"), &Session::CmdNick)
-        .Func(_SC("CmdWhois"), &Session::CmdWhois)
-        .Func(_SC("SendRaw"), &Session::SendRaw)
-        .Func(_SC("DestroyDcc"), &Session::DestroyDcc)
-        .Func(_SC("SetCtcpVersion"), &Session::SetCtcpVersion)
-        .Func(_SC("SetOption"), &Session::SetOption)
-        .Func(_SC("ResetOption"), &Session::ResetOption)
-        // Member Overloads
-        .Overload< Int32 (Session::*)(void) >(_SC("Connect"), &Session::Connect)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr) >(_SC("Connect"), &Session::Connect)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr) >(_SC("Connect"), &Session::Connect)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr) >(_SC("Connect"), &Session::Connect)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr, CSStr) >(_SC("Connect"), &Session::Connect)
-        .Overload< Int32 (Session::*)(void) >(_SC("Connect6"), &Session::Connect6)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr) >(_SC("Connect6"), &Session::Connect6)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr) >(_SC("Connect6"), &Session::Connect6)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr) >(_SC("Connect6"), &Session::Connect6)
-        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr, CSStr) >(_SC("Connect6"), &Session::Connect6)
-        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdJoin"), &Session::CmdJoin)
-        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdJoin"), &Session::CmdJoin)
-        .Overload< Int32 (Session::*)(void) >(_SC("CmdList"), &Session::CmdList)
-        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdList"), &Session::CmdList)
-        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdTopic"), &Session::CmdTopic)
-        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdTopic"), &Session::CmdTopic)
-        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdChannelMode"), &Session::CmdChannelMode)
-        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdChannelMode"), &Session::CmdChannelMode)
-        .Overload< Int32 (Session::*)(void) >(_SC("CmdUserMode"), &Session::CmdUserMode)
-        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdUserMode"), &Session::CmdUserMode)
-        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdKick"), &Session::CmdKick)
-        .Overload< Int32 (Session::*)(CSStr, CSStr, CSStr) >(_SC("CmdKick"), &Session::CmdKick)
-        .Overload< Int32 (Session::*)(void) >(_SC("CmdQuit"), &Session::CmdQuit)
-        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdQuit"), &Session::CmdQuit)
-        // Squirrel Methods
-        .SquirrelFunc(_SC("CmdMsgF"), &Session::CmdMsgF)
-        .SquirrelFunc(_SC("CmdMeF"), &Session::CmdMeF)
-        .SquirrelFunc(_SC("CmdNoticeF"), &Session::CmdNoticeF)
-    );
-
-    ircns.Func(_SC("GetErrStr"), &irc_strerror);
-    ircns.SquirrelFunc(_SC("GetNick"), &GetNick);
-    ircns.SquirrelFunc(_SC("GetHost"), &GetHost);
-    ircns.SquirrelFunc(_SC("StripColorFromMIRC"), &StripColorFromMIRC);
-    ircns.SquirrelFunc(_SC("ConvertColorFromMIRC"), &ConvertColorFromMIRC);
-    ircns.SquirrelFunc(_SC("ConvertColorToMIRC"), &ConvertColorToMIRC);
-
-    RootTable(vm).Bind(_SC("SqIRC"), ircns);
-
-    Sqrat::ConstTable(vm).Enum(_SC("SqIrcEvent"), Sqrat::Enumeration(vm)
-        .Const(_SC("Connect"),                  SET_CONNECT)
-        .Const(_SC("Nick"),                     SET_NICK)
-        .Const(_SC("Quit"),                     SET_QUIT)
-        .Const(_SC("Join"),                     SET_JOIN)
-        .Const(_SC("Part"),                     SET_PART)
-        .Const(_SC("Mode"),                     SET_MODE)
-        .Const(_SC("Umode"),                    SET_UMODE)
-        .Const(_SC("Topic"),                    SET_TOPIC)
-        .Const(_SC("Kick"),                     SET_KICK)
-        .Const(_SC("Channel"),                  SET_CHANNEL)
-        .Const(_SC("PrivMsg"),                  SET_PRIVMSG)
-        .Const(_SC("Notice"),                   SET_NOTICE)
-        .Const(_SC("ChannelNotice"),            SET_CHANNELNOTICE)
-        .Const(_SC("Invite"),                   SET_INVITE)
-        .Const(_SC("CtcpReq"),                  SET_CTCPREQ)
-        .Const(_SC("CtcpRep"),                  SET_CTCPREP)
-        .Const(_SC("CtcpAction"),               SET_CTCPACTION)
-        .Const(_SC("Unknown"),                  SET_UNKNOWN)
-        .Const(_SC("Numeric"),                  SET_NUMERIC)
-        .Const(_SC("DccChatReq"),               SET_DCCCHATREQ)
-        .Const(_SC("DccSendReq"),               SET_DCCSENDREQ)
-    );
-
-    Sqrat::ConstTable(vm).Enum(_SC("SqIrcErr"), Sqrat::Enumeration(vm)
-        .Const(_SC("Ok"),                       LIBIRC_ERR_OK)
-        .Const(_SC("InVal"),                    LIBIRC_ERR_INVAL)
-        .Const(_SC("Resolv"),                   LIBIRC_ERR_RESOLV)
-        .Const(_SC("Socket"),                   LIBIRC_ERR_SOCKET)
-        .Const(_SC("Connect"),                  LIBIRC_ERR_CONNECT)
-        .Const(_SC("Closed"),                   LIBIRC_ERR_CLOSED)
-        .Const(_SC("NoMem"),                    LIBIRC_ERR_NOMEM)
-        .Const(_SC("Accept"),                   LIBIRC_ERR_ACCEPT)
-        .Const(_SC("NoDccSend"),                LIBIRC_ERR_NODCCSEND)
-        .Const(_SC("Read"),                     LIBIRC_ERR_READ)
-        .Const(_SC("Write"),                    LIBIRC_ERR_WRITE)
-        .Const(_SC("State"),                    LIBIRC_ERR_STATE)
-        .Const(_SC("Timeout"),                  LIBIRC_ERR_TIMEOUT)
-        .Const(_SC("OpenFile"),                 LIBIRC_ERR_OPENFILE)
-        .Const(_SC("Terminated"),               LIBIRC_ERR_TERMINATED)
-        .Const(_SC("NoIPv6"),                   LIBIRC_ERR_NOIPV6)
-        .Const(_SC("SSLNotSupported"),          LIBIRC_ERR_SSL_NOT_SUPPORTED)
-        .Const(_SC("SSLInitFailed"),            LIBIRC_ERR_SSL_INIT_FAILED)
-        .Const(_SC("ConnectSSLFailed"),         LIBIRC_ERR_CONNECT_SSL_FAILED)
-        .Const(_SC("SSLCertVerifyFailed"),      LIBIRC_ERR_SSL_CERT_VERIFY_FAILED)
-        .Const(_SC("Max"),                      LIBIRC_ERR_MAX)
-    );
-
-    Sqrat::ConstTable(vm).Enum(_SC("SqIrcOpt"), Sqrat::Enumeration(vm)
-        .Const(_SC("Debug"),                    LIBIRC_OPTION_DEBUG)
-        .Const(_SC("StripNicks"),               LIBIRC_OPTION_STRIPNICKS)
-        .Const(_SC("SSLNoVerify"),              LIBIRC_OPTION_SSL_NO_VERIFY)
-    );
-
-    Sqrat::ConstTable(vm).Enum(_SC("SqIrcRFC"), Sqrat::Enumeration(vm)
-        .Const(_SC("RPL_WELCOME"),              LIBIRC_RFC_RPL_WELCOME)
-        .Const(_SC("RPL_YOURHOST"),             LIBIRC_RFC_RPL_YOURHOST)
-        .Const(_SC("RPL_CREATED"),              LIBIRC_RFC_RPL_CREATED)
-        .Const(_SC("RPL_MYINFO"),               LIBIRC_RFC_RPL_MYINFO)
-        .Const(_SC("RPL_BOUNCE"),               LIBIRC_RFC_RPL_BOUNCE)
-        .Const(_SC("RPL_NONE"),                 LIBIRC_RFC_RPL_NONE)
-        .Const(_SC("RPL_USERHOST"),             LIBIRC_RFC_RPL_USERHOST)
-        .Const(_SC("RPL_ISON"),                 LIBIRC_RFC_RPL_ISON)
-        .Const(_SC("RPL_AWAY"),                 LIBIRC_RFC_RPL_AWAY)
-        .Const(_SC("RPL_UNAWAY"),               LIBIRC_RFC_RPL_UNAWAY)
-        .Const(_SC("RPL_NOWAWAY"),              LIBIRC_RFC_RPL_NOWAWAY)
-        .Const(_SC("RPL_WHOISUSER"),            LIBIRC_RFC_RPL_WHOISUSER)
-        .Const(_SC("RPL_WHOISSERVER"),          LIBIRC_RFC_RPL_WHOISSERVER)
-        .Const(_SC("RPL_WHOISOPERATOR"),        LIBIRC_RFC_RPL_WHOISOPERATOR)
-        .Const(_SC("RPL_WHOISIDLE"),            LIBIRC_RFC_RPL_WHOISIDLE)
-        .Const(_SC("RPL_ENDOFWHOIS"),           LIBIRC_RFC_RPL_ENDOFWHOIS)
-        .Const(_SC("RPL_WHOISCHANNELS"),        LIBIRC_RFC_RPL_WHOISCHANNELS)
-        .Const(_SC("RPL_WHOWASUSER"),           LIBIRC_RFC_RPL_WHOWASUSER)
-        .Const(_SC("RPL_ENDOFWHOWAS"),          LIBIRC_RFC_RPL_ENDOFWHOWAS)
-        .Const(_SC("RPL_LISTSTART"),            LIBIRC_RFC_RPL_LISTSTART)
-        .Const(_SC("RPL_LIST"),                 LIBIRC_RFC_RPL_LIST)
-        .Const(_SC("RPL_LISTEND"),              LIBIRC_RFC_RPL_LISTEND)
-        .Const(_SC("RPL_UNIQOPIS"),             LIBIRC_RFC_RPL_UNIQOPIS)
-        .Const(_SC("RPL_CHANNELMODEIS"),        LIBIRC_RFC_RPL_CHANNELMODEIS)
-        .Const(_SC("RPL_NOTOPIC"),              LIBIRC_RFC_RPL_NOTOPIC)
-        .Const(_SC("RPL_TOPIC"),                LIBIRC_RFC_RPL_TOPIC)
-        .Const(_SC("RPL_INVITING"),             LIBIRC_RFC_RPL_INVITING)
-        .Const(_SC("RPL_SUMMONING"),            LIBIRC_RFC_RPL_SUMMONING)
-        .Const(_SC("RPL_INVITELIST"),           LIBIRC_RFC_RPL_INVITELIST)
-        .Const(_SC("RPL_ENDOFINVITELIST"),      LIBIRC_RFC_RPL_ENDOFINVITELIST)
-        .Const(_SC("RPL_EXCEPTLIST"),           LIBIRC_RFC_RPL_EXCEPTLIST)
-        .Const(_SC("RPL_ENDOFEXCEPTLIST"),      LIBIRC_RFC_RPL_ENDOFEXCEPTLIST)
-        .Const(_SC("RPL_VERSION"),              LIBIRC_RFC_RPL_VERSION)
-        .Const(_SC("RPL_WHOREPLY"),             LIBIRC_RFC_RPL_WHOREPLY)
-        .Const(_SC("RPL_ENDOFWHO"),             LIBIRC_RFC_RPL_ENDOFWHO)
-        .Const(_SC("RPL_NAMREPLY"),             LIBIRC_RFC_RPL_NAMREPLY)
-        .Const(_SC("RPL_ENDOFNAMES"),           LIBIRC_RFC_RPL_ENDOFNAMES)
-        .Const(_SC("RPL_LINKS"),                LIBIRC_RFC_RPL_LINKS)
-        .Const(_SC("RPL_ENDOFLINKS"),           LIBIRC_RFC_RPL_ENDOFLINKS)
-        .Const(_SC("RPL_BANLIST"),              LIBIRC_RFC_RPL_BANLIST)
-        .Const(_SC("RPL_ENDOFBANLIST"),         LIBIRC_RFC_RPL_ENDOFBANLIST)
-        .Const(_SC("RPL_INFO"),                 LIBIRC_RFC_RPL_INFO)
-        .Const(_SC("RPL_ENDOFINFO"),            LIBIRC_RFC_RPL_ENDOFINFO)
-        .Const(_SC("RPL_MOTDSTART"),            LIBIRC_RFC_RPL_MOTDSTART)
-        .Const(_SC("RPL_MOTD"),                 LIBIRC_RFC_RPL_MOTD)
-        .Const(_SC("RPL_ENDOFMOTD"),            LIBIRC_RFC_RPL_ENDOFMOTD)
-        .Const(_SC("RPL_YOUREOPER"),            LIBIRC_RFC_RPL_YOUREOPER)
-        .Const(_SC("RPL_REHASHING"),            LIBIRC_RFC_RPL_REHASHING)
-        .Const(_SC("RPL_YOURESERVICE"),         LIBIRC_RFC_RPL_YOURESERVICE)
-        .Const(_SC("RPL_TIME"),                 LIBIRC_RFC_RPL_TIME)
-        .Const(_SC("RPL_USERSSTART"),           LIBIRC_RFC_RPL_USERSSTART)
-        .Const(_SC("RPL_USERS"),                LIBIRC_RFC_RPL_USERS)
-        .Const(_SC("RPL_ENDOFUSERS"),           LIBIRC_RFC_RPL_ENDOFUSERS)
-        .Const(_SC("RPL_NOUSERS"),              LIBIRC_RFC_RPL_NOUSERS)
-        .Const(_SC("RPL_TRACELINK"),            LIBIRC_RFC_RPL_TRACELINK)
-        .Const(_SC("RPL_TRACECONNECTING"),      LIBIRC_RFC_RPL_TRACECONNECTING)
-        .Const(_SC("RPL_TRACEHANDSHAKE"),       LIBIRC_RFC_RPL_TRACEHANDSHAKE)
-        .Const(_SC("RPL_TRACEUNKNOWN"),         LIBIRC_RFC_RPL_TRACEUNKNOWN)
-        .Const(_SC("RPL_TRACEOPERATOR"),        LIBIRC_RFC_RPL_TRACEOPERATOR)
-        .Const(_SC("RPL_TRACEUSER"),            LIBIRC_RFC_RPL_TRACEUSER)
-        .Const(_SC("RPL_TRACESERVER"),          LIBIRC_RFC_RPL_TRACESERVER)
-        .Const(_SC("RPL_TRACESERVICE"),         LIBIRC_RFC_RPL_TRACESERVICE)
-        .Const(_SC("RPL_TRACENEWTYPE"),         LIBIRC_RFC_RPL_TRACENEWTYPE)
-        .Const(_SC("RPL_TRACECLASS"),           LIBIRC_RFC_RPL_TRACECLASS)
-        .Const(_SC("RPL_TRACELOG"),             LIBIRC_RFC_RPL_TRACELOG)
-        .Const(_SC("RPL_TRACEEND"),             LIBIRC_RFC_RPL_TRACEEND)
-        .Const(_SC("RPL_STATSLINKINFO"),        LIBIRC_RFC_RPL_STATSLINKINFO)
-        .Const(_SC("RPL_STATSCOMMANDS"),        LIBIRC_RFC_RPL_STATSCOMMANDS)
-        .Const(_SC("RPL_ENDOFSTATS"),           LIBIRC_RFC_RPL_ENDOFSTATS)
-        .Const(_SC("RPL_STATSUPTIME"),          LIBIRC_RFC_RPL_STATSUPTIME)
-        .Const(_SC("RPL_STATSOLINE"),           LIBIRC_RFC_RPL_STATSOLINE)
-        .Const(_SC("RPL_UMODEIS"),              LIBIRC_RFC_RPL_UMODEIS)
-        .Const(_SC("RPL_SERVLIST"),             LIBIRC_RFC_RPL_SERVLIST)
-        .Const(_SC("RPL_SERVLISTEND"),          LIBIRC_RFC_RPL_SERVLISTEND)
-        .Const(_SC("RPL_LUSERCLIENT"),          LIBIRC_RFC_RPL_LUSERCLIENT)
-        .Const(_SC("RPL_LUSEROP"),              LIBIRC_RFC_RPL_LUSEROP)
-        .Const(_SC("RPL_LUSERUNKNOWN"),         LIBIRC_RFC_RPL_LUSERUNKNOWN)
-        .Const(_SC("RPL_LUSERCHANNELS"),        LIBIRC_RFC_RPL_LUSERCHANNELS)
-        .Const(_SC("RPL_LUSERME"),              LIBIRC_RFC_RPL_LUSERME)
-        .Const(_SC("RPL_ADMINME"),              LIBIRC_RFC_RPL_ADMINME)
-        .Const(_SC("RPL_ADMINLOC1"),            LIBIRC_RFC_RPL_ADMINLOC1)
-        .Const(_SC("RPL_ADMINLOC2"),            LIBIRC_RFC_RPL_ADMINLOC2)
-        .Const(_SC("RPL_ADMINEMAIL"),           LIBIRC_RFC_RPL_ADMINEMAIL)
-        .Const(_SC("RPL_TRYAGAIN"),             LIBIRC_RFC_RPL_TRYAGAIN)
-        .Const(_SC("ERR_NOSUCHNICK"),           LIBIRC_RFC_ERR_NOSUCHNICK)
-        .Const(_SC("ERR_NOSUCHSERVER"),         LIBIRC_RFC_ERR_NOSUCHSERVER)
-        .Const(_SC("ERR_NOSUCHCHANNEL"),        LIBIRC_RFC_ERR_NOSUCHCHANNEL)
-        .Const(_SC("ERR_CANNOTSENDTOCHAN"),     LIBIRC_RFC_ERR_CANNOTSENDTOCHAN)
-        .Const(_SC("ERR_TOOMANYCHANNELS"),      LIBIRC_RFC_ERR_TOOMANYCHANNELS)
-        .Const(_SC("ERR_WASNOSUCHNICK"),        LIBIRC_RFC_ERR_WASNOSUCHNICK)
-        .Const(_SC("ERR_TOOMANYTARGETS"),       LIBIRC_RFC_ERR_TOOMANYTARGETS)
-        .Const(_SC("ERR_NOSUCHSERVICE"),        LIBIRC_RFC_ERR_NOSUCHSERVICE)
-        .Const(_SC("ERR_NOORIGIN"),             LIBIRC_RFC_ERR_NOORIGIN)
-        .Const(_SC("ERR_NORECIPIENT"),          LIBIRC_RFC_ERR_NORECIPIENT)
-        .Const(_SC("ERR_NOTEXTTOSEND"),         LIBIRC_RFC_ERR_NOTEXTTOSEND)
-        .Const(_SC("ERR_NOTOPLEVEL"),           LIBIRC_RFC_ERR_NOTOPLEVEL)
-        .Const(_SC("ERR_WILDTOPLEVEL"),         LIBIRC_RFC_ERR_WILDTOPLEVEL)
-        .Const(_SC("ERR_BADMASK"),              LIBIRC_RFC_ERR_BADMASK)
-        .Const(_SC("ERR_UNKNOWNCOMMAND"),       LIBIRC_RFC_ERR_UNKNOWNCOMMAND)
-        .Const(_SC("ERR_NOMOTD"),               LIBIRC_RFC_ERR_NOMOTD)
-        .Const(_SC("ERR_NOADMININFO"),          LIBIRC_RFC_ERR_NOADMININFO)
-        .Const(_SC("ERR_FILEERROR"),            LIBIRC_RFC_ERR_FILEERROR)
-        .Const(_SC("ERR_NONICKNAMEGIVEN"),      LIBIRC_RFC_ERR_NONICKNAMEGIVEN)
-        .Const(_SC("ERR_ERRONEUSNICKNAME"),     LIBIRC_RFC_ERR_ERRONEUSNICKNAME)
-        .Const(_SC("ERR_NICKNAMEINUSE"),        LIBIRC_RFC_ERR_NICKNAMEINUSE)
-        .Const(_SC("ERR_NICKCOLLISION"),        LIBIRC_RFC_ERR_NICKCOLLISION)
-        .Const(_SC("ERR_UNAVAILRESOURCE"),      LIBIRC_RFC_ERR_UNAVAILRESOURCE)
-        .Const(_SC("ERR_USERNOTINCHANNEL"),     LIBIRC_RFC_ERR_USERNOTINCHANNEL)
-        .Const(_SC("ERR_NOTONCHANNEL"),         LIBIRC_RFC_ERR_NOTONCHANNEL)
-        .Const(_SC("ERR_USERONCHANNEL"),        LIBIRC_RFC_ERR_USERONCHANNEL)
-        .Const(_SC("ERR_NOLOGIN"),              LIBIRC_RFC_ERR_NOLOGIN)
-        .Const(_SC("ERR_SUMMONDISABLED"),       LIBIRC_RFC_ERR_SUMMONDISABLED)
-        .Const(_SC("ERR_USERSDISABLED"),        LIBIRC_RFC_ERR_USERSDISABLED)
-        .Const(_SC("ERR_NOTREGISTERED"),        LIBIRC_RFC_ERR_NOTREGISTERED)
-        .Const(_SC("ERR_NEEDMOREPARAMS"),       LIBIRC_RFC_ERR_NEEDMOREPARAMS)
-        .Const(_SC("ERR_ALREADYREGISTRED"),     LIBIRC_RFC_ERR_ALREADYREGISTRED)
-        .Const(_SC("ERR_NOPERMFORHOST"),        LIBIRC_RFC_ERR_NOPERMFORHOST)
-        .Const(_SC("ERR_PASSWDMISMATCH"),       LIBIRC_RFC_ERR_PASSWDMISMATCH)
-        .Const(_SC("ERR_YOUREBANNEDCREEP"),     LIBIRC_RFC_ERR_YOUREBANNEDCREEP)
-        .Const(_SC("ERR_YOUWILLBEBANNED"),      LIBIRC_RFC_ERR_YOUWILLBEBANNED)
-        .Const(_SC("ERR_KEYSET"),               LIBIRC_RFC_ERR_KEYSET)
-        .Const(_SC("ERR_CHANNELISFULL"),        LIBIRC_RFC_ERR_CHANNELISFULL)
-        .Const(_SC("ERR_UNKNOWNMODE"),          LIBIRC_RFC_ERR_UNKNOWNMODE)
-        .Const(_SC("ERR_INVITEONLYCHAN"),       LIBIRC_RFC_ERR_INVITEONLYCHAN)
-        .Const(_SC("ERR_BANNEDFROMCHAN"),       LIBIRC_RFC_ERR_BANNEDFROMCHAN)
-        .Const(_SC("ERR_BADCHANNELKEY"),        LIBIRC_RFC_ERR_BADCHANNELKEY)
-        .Const(_SC("ERR_BADCHANMASK"),          LIBIRC_RFC_ERR_BADCHANMASK)
-        .Const(_SC("ERR_NOCHANMODES"),          LIBIRC_RFC_ERR_NOCHANMODES)
-        .Const(_SC("ERR_BANLISTFULL"),          LIBIRC_RFC_ERR_BANLISTFULL)
-        .Const(_SC("ERR_NOPRIVILEGES"),         LIBIRC_RFC_ERR_NOPRIVILEGES)
-        .Const(_SC("ERR_CHANOPRIVSNEEDED"),     LIBIRC_RFC_ERR_CHANOPRIVSNEEDED)
-        .Const(_SC("ERR_CANTKILLSERVER"),       LIBIRC_RFC_ERR_CANTKILLSERVER)
-        .Const(_SC("ERR_RESTRICTED"),           LIBIRC_RFC_ERR_RESTRICTED)
-        .Const(_SC("ERR_UNIQOPPRIVSNEEDED"),    LIBIRC_RFC_ERR_UNIQOPPRIVSNEEDED)
-        .Const(_SC("ERR_NOOPERHOST"),           LIBIRC_RFC_ERR_NOOPERHOST)
-        .Const(_SC("ERR_UMODEUNKNOWNFLAG"),     LIBIRC_RFC_ERR_UMODEUNKNOWNFLAG)
-        .Const(_SC("ERR_USERSDONTMATCH"),       LIBIRC_RFC_ERR_USERSDONTMATCH)
-    );
+    SessionProcess(); // Update the sessions and pool for events
 }
 
 } // Namespace:: SqMod
@@ -471,20 +192,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQIRC_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQIRC_NAME))
     {
-        OutputError("%s could find the host plug-in", SQIRC_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQIRC_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
 #ifdef SQMOD_OS_WINDOWS
diff --git a/modules/irc/Session.cpp b/modules/irc/Session.cpp
index c494db42..10157ca9 100644
--- a/modules/irc/Session.cpp
+++ b/modules/irc/Session.cpp
@@ -440,24 +440,24 @@ Int32 Session::CmdNick(CSStr nick)
 Object Session::GetNextTry() const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Attempt to push a time-stamp instance on the stack
-    SqMod_PushTimestamp(_SqVM, m_NextTry);
+    SqMod_PushTimestamp(DefaultVM::Get(), m_NextTry);
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 void Session::SetNextTry(Object & tm)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object >::push(_SqVM, tm);
+    Var< Object >::push(DefaultVM::Get(), tm);
     // The resulted times-tamp value
     Int64 microseconds = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetTimestamp(_SqVM, -1, &microseconds)))
+    if (SQ_FAILED(SqMod_GetTimestamp(DefaultVM::Get(), -1, &microseconds)))
     {
         STHROWF("Invalid time-stamp specified");
     }
@@ -469,19 +469,19 @@ void Session::SetNextTry(Object & tm)
 Object Session::GetSessionTime() const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Attempt to push a time-stamp instance on the stack
     if (m_SessionTime)
     {
-        SqMod_PushTimestamp(_SqVM, SqMod_GetEpochTimeMicro() - m_SessionTime);
+        SqMod_PushTimestamp(DefaultVM::Get(), SqMod_GetEpochTimeMicro() - m_SessionTime);
     }
     // This session was not connected yet
     else
     {
-        SqMod_PushTimestamp(_SqVM, 0);
+        SqMod_PushTimestamp(DefaultVM::Get(), 0);
     }
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -682,7 +682,7 @@ void Session::ForwardEvent(Function & listener, CCStr event, CCStr origin, CCStr
         origin = _SC("");
     }
     // Each event must have an array of parameters (empty or not)
-    Array parameters(_SqVM, count);
+    Array parameters(DefaultVM::Get(), count);
     // Are the any parameters?
     if (params && count > 0)
     {
@@ -726,7 +726,7 @@ void Session::ForwardEvent(Function & listener, Uint32 event,
         origin = _SC("");
     }
     // Each event must have an array of parameters (empty or not)
-    Array parameters(_SqVM, count);
+    Array parameters(DefaultVM::Get(), count);
     // Are the any parameters?
     if (params && count > 0)
     {
@@ -1181,4 +1181,104 @@ SQInteger Session::CmdNoticeF(HSQUIRRELVM vm)
     return 1;
 }
 
+/* -----------------------------------------------------------------------------------------------
+ * Helper function used to avoid having to include the session header.
+*/
+void SessionProcess()
+{
+    Session::Process();
+}
+
+/* -----------------------------------------------------------------------------------------------
+ * Helper function used to avoid having to include the session header.
+*/
+void SessionTerminate()
+{
+    Session::Terminate();
+}
+
+// ================================================================================================
+void Register_Session(Table & ircns)
+{
+    ircns.Bind(_SC("Session"), Class< Session, NoCopy< Session > >(ircns.GetVM(), _SC("SqIrcSession"))
+        // Constructors
+        .Ctor()
+        // Core Meta-methods
+        .Func(_SC("_cmp"), &Session::Cmp)
+        .SquirrelFunc(_SC("_typename"), &Session::Typename)
+        .Func(_SC("_tostring"), &Session::ToString)
+        // Properties
+        .Prop(_SC("Valid"), &Session::IsValid)
+        .Prop(_SC("Connected"), &Session::IsConnected)
+        .Prop(_SC("Tag"), &Session::GetTag, &Session::SetTag)
+        .Prop(_SC("Data"), &Session::GetData, &Session::SetData)
+        .Prop(_SC("Server"), &Session::GetServer, &Session::SetServer)
+        .Prop(_SC("Password"), &Session::GetPassword, &Session::SetPassword)
+        .Prop(_SC("Nick"), &Session::GetNick, &Session::SetNick)
+        .Prop(_SC("User"), &Session::GetUser, &Session::SetUser)
+        .Prop(_SC("Name"), &Session::GetName, &Session::SetName)
+        .Prop(_SC("Port"), &Session::GetPort, &Session::SetPort)
+        .Prop(_SC("PoolTime"), &Session::GetPoolTime, &Session::SetPoolTime)
+        .Prop(_SC("LastCode"), &Session::GetLastCode)
+        .Prop(_SC("Tries"), &Session::GetTries, &Session::SetTries)
+        .Prop(_SC("Wait"), &Session::GetWait, &Session::SetWait)
+        .Prop(_SC("LeftTries"), &Session::GetLeftTries, &Session::SetLeftTries)
+        .Prop(_SC("NextTry"), &Session::GetNextTry, &Session::SetNextTry)
+        .Prop(_SC("SessionTime"), &Session::GetSessionTime)
+        .Prop(_SC("Reconnecting"), &Session::GetReconnect)
+        .Prop(_SC("IPv6"), &Session::GetIPv6)
+        .Prop(_SC("CtcpVersion"), (void (Session::*)(void))(nullptr), &Session::SetCtcpVersion)
+        .Prop(_SC("ErrNo"), &Session::GetErrNo)
+        .Prop(_SC("ErrStr"), &Session::GetErrStr)
+        // Member Methods
+        .Func(_SC("Bind"), &Session::BindEvent)
+        .Func(_SC("GetEvent"), &Session::GetEvent)
+        .Func(_SC("Disconnect"), &Session::Disconnect)
+        .Func(_SC("CmdPart"), &Session::CmdPart)
+        .Func(_SC("CmdInvite"), &Session::CmdInvite)
+        .Func(_SC("CmdNames"), &Session::CmdNames)
+        .Func(_SC("CmdMsg"), &Session::CmdMsg)
+        .Func(_SC("CmdMe"), &Session::CmdMe)
+        .Func(_SC("CmdNotice"), &Session::CmdNotice)
+        .Func(_SC("CmdCtcpRequest"), &Session::CmdCtcpRequest)
+        .Func(_SC("CmdCtcpReply"), &Session::CmdCtcpReply)
+        .Func(_SC("CmdNick"), &Session::CmdNick)
+        .Func(_SC("CmdWhois"), &Session::CmdWhois)
+        .Func(_SC("SendRaw"), &Session::SendRaw)
+        .Func(_SC("DestroyDcc"), &Session::DestroyDcc)
+        .Func(_SC("SetCtcpVersion"), &Session::SetCtcpVersion)
+        .Func(_SC("SetOption"), &Session::SetOption)
+        .Func(_SC("ResetOption"), &Session::ResetOption)
+        // Member Overloads
+        .Overload< Int32 (Session::*)(void) >(_SC("Connect"), &Session::Connect)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr) >(_SC("Connect"), &Session::Connect)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr) >(_SC("Connect"), &Session::Connect)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr) >(_SC("Connect"), &Session::Connect)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr, CSStr) >(_SC("Connect"), &Session::Connect)
+        .Overload< Int32 (Session::*)(void) >(_SC("Connect6"), &Session::Connect6)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr) >(_SC("Connect6"), &Session::Connect6)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr) >(_SC("Connect6"), &Session::Connect6)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr) >(_SC("Connect6"), &Session::Connect6)
+        .Overload< Int32 (Session::*)(CSStr, Uint32, CSStr, CSStr, CSStr, CSStr) >(_SC("Connect6"), &Session::Connect6)
+        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdJoin"), &Session::CmdJoin)
+        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdJoin"), &Session::CmdJoin)
+        .Overload< Int32 (Session::*)(void) >(_SC("CmdList"), &Session::CmdList)
+        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdList"), &Session::CmdList)
+        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdTopic"), &Session::CmdTopic)
+        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdTopic"), &Session::CmdTopic)
+        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdChannelMode"), &Session::CmdChannelMode)
+        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdChannelMode"), &Session::CmdChannelMode)
+        .Overload< Int32 (Session::*)(void) >(_SC("CmdUserMode"), &Session::CmdUserMode)
+        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdUserMode"), &Session::CmdUserMode)
+        .Overload< Int32 (Session::*)(CSStr, CSStr) >(_SC("CmdKick"), &Session::CmdKick)
+        .Overload< Int32 (Session::*)(CSStr, CSStr, CSStr) >(_SC("CmdKick"), &Session::CmdKick)
+        .Overload< Int32 (Session::*)(void) >(_SC("CmdQuit"), &Session::CmdQuit)
+        .Overload< Int32 (Session::*)(CSStr) >(_SC("CmdQuit"), &Session::CmdQuit)
+        // Squirrel Methods
+        .SquirrelFunc(_SC("CmdMsgF"), &Session::CmdMsgF)
+        .SquirrelFunc(_SC("CmdMeF"), &Session::CmdMeF)
+        .SquirrelFunc(_SC("CmdNoticeF"), &Session::CmdNoticeF)
+    );
+}
+
 } // Namespace:: SqMod
diff --git a/modules/json/Common.cpp b/modules/json/Common.cpp
index 0426102c..364feb35 100644
--- a/modules/json/Common.cpp
+++ b/modules/json/Common.cpp
@@ -43,7 +43,7 @@ void SqThrowLast(HSQUIRRELVM vm, CSStr msg)
 }
 
 // ------------------------------------------------------------------------------------------------
-Object SqFromJSON(HSQUIRRELVM vm, json_t * jval)
+Object SqFromJSON(HSQUIRRELVM /*vm*/, json_t * jval)
 {
     switch (json_typeof(jval))
     {
diff --git a/modules/json/JArray.cpp b/modules/json/JArray.cpp
index f2924d96..fa42892d 100644
--- a/modules/json/JArray.cpp
+++ b/modules/json/JArray.cpp
@@ -23,9 +23,9 @@ Object JArray::ToString() const
     // Remember the current stack size
     const StackGuard sg;
     // Transform the string into a script object
-    sq_pushstring(_SqVM, csg.mPtr ? csg.mPtr : _SC(""), -1);
+    sq_pushstring(DefaultVM::Get(), csg.mPtr ? csg.mPtr : _SC(""), -1);
     // Return the created script object
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ================================================================================================
diff --git a/modules/json/JObject.cpp b/modules/json/JObject.cpp
index e5545cad..9d1e7cf3 100644
--- a/modules/json/JObject.cpp
+++ b/modules/json/JObject.cpp
@@ -23,9 +23,9 @@ Object JObject::ToString() const
     // Remember the current stack size
     const StackGuard sg;
     // Transform the string into a script object
-    sq_pushstring(_SqVM, csg.mPtr ? csg.mPtr : _SC(""), -1);
+    sq_pushstring(DefaultVM::Get(), csg.mPtr ? csg.mPtr : _SC(""), -1);
     // Return the created script object
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ================================================================================================
diff --git a/modules/json/JValue.cpp b/modules/json/JValue.cpp
index 15a340ab..8ce6214a 100644
--- a/modules/json/JValue.cpp
+++ b/modules/json/JValue.cpp
@@ -23,9 +23,9 @@ Object JValue::ToString() const
     // Remember the current stack size
     const StackGuard sg;
     // Transform the string into a script object
-    sq_pushstring(_SqVM, csg.mPtr ? csg.mPtr : _SC(""), -1);
+    sq_pushstring(DefaultVM::Get(), csg.mPtr ? csg.mPtr : _SC(""), -1);
     // Return the created script object
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/modules/json/Module.cpp b/modules/json/Module.cpp
index 909c1019..d65987a1 100644
--- a/modules/json/Module.cpp
+++ b/modules/json/Module.cpp
@@ -8,68 +8,91 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
-/* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
-*/
-void RegisterAPI(HSQUIRRELVM vm);
+// ------------------------------------------------------------------------------------------------
+extern void Register_Common(Table & jns);
+extern void Register_JArray(Table & jns);
+extern void Register_JObject(Table & jns);
+extern void Register_JValue(Table & jns);
 
 /* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
+ * Register the module API under the obtained virtual machine.
 */
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQJSON_NAME);
-    }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQJSON_NAME);
+        // Registration failed
+        return false;
     }
+
+    Table jns;
+
+    Register_Common(jns);
+    Register_JArray(jns);
+    Register_JObject(jns);
+    Register_JValue(jns);
+
+    RootTable().Bind(_SC("SqJSON"), jns);
+
+    Sqrat::ConstTable()
+        .Const(_SC("JSON_OBJECT"),  JSON_OBJECT)
+        .Const(_SC("JSON_ARRAY"),   JSON_ARRAY)
+        .Const(_SC("JSON_STRING"),  JSON_STRING)
+        .Const(_SC("JSON_INTEGER"), JSON_INTEGER)
+        .Const(_SC("JSON_REAL"),    JSON_REAL)
+        .Const(_SC("JSON_TRUE"),    JSON_TRUE)
+        .Const(_SC("JSON_FALSE"),   JSON_FALSE)
+        .Const(_SC("JSON_NULL"),    JSON_NULL);
+
+    // Registration was successful
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * Load the module on the virtual machine provided by the host module.
 */
-void OnSquirrelLoad()
+static bool OnSquirrelLoad()
 {
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
     {
-        return; // Unable to proceed.
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQJSON_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
     // Make sure that a valid virtual machine exists
-    if (!_SqVM)
+    if (!DefaultVM::Get())
     {
-        return; // Unable to proceed.
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQJSON_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
     // Prevent common null objects from using dead virtual machines
     NullArray() = Array();
     NullTable() = Table();
     NullObject() = Object();
     NullFunction() = Function();
     // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQJSON_NAME);
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQJSON_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machine is about to be terminated and script resources should be released.
 */
-void OnSquirrelTerminate()
+static void OnSquirrelTerminate()
 {
     OutputMessage("Terminating: %s", SQJSON_NAME);
     // Release null objects just in case
@@ -82,31 +105,12 @@ void OnSquirrelTerminate()
 /* ------------------------------------------------------------------------------------------------
  * The virtual machined was closed and all memory associated with it was released.
 */
-void OnSquirrelReleased()
+static void OnSquirrelReleased()
 {
     // Release the current virtual machine, if any
     DefaultVM::Set(nullptr);
 }
 
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQJSON_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
 /* ------------------------------------------------------------------------------------------------
  * React to command sent by other plug-ins.
 */
@@ -115,20 +119,33 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
     switch(command_identifier)
     {
         case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
+        {
+            if (CheckModuleAPIVer(message, SQJSON_NAME))
             {
-                OnSquirrelInitialize();
+                try
+                {
+                    ImportModuleAPI(_Func, SQJSON_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
             }
-        break;
+        } break;
         case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
+        {
+            return OnSquirrelLoad();
+        } break;
         case SQMOD_TERMINATE_CMD:
+        {
             OnSquirrelTerminate();
-        break;
+        } break;
         case SQMOD_RELEASED_CMD:
+        {
             OnSquirrelReleased();
-        break;
+        } break;
         default: break;
     }
     return 1;
@@ -139,9 +156,12 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
 */
 static uint8_t OnServerInitialise()
 {
-    return 1;
+    return 1; // Initialization was successful
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
 static void OnServerShutdown(void)
 {
     // The server may still send callbacks
@@ -150,35 +170,6 @@ static void OnServerShutdown(void)
     _Clbk->OnPluginCommand          = nullptr;
 }
 
-// ------------------------------------------------------------------------------------------------
-extern void Register_Common(Table & jns);
-extern void Register_JArray(Table & jns);
-extern void Register_JObject(Table & jns);
-extern void Register_JValue(Table & jns);
-
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    Table jns(vm);
-
-    Register_Common(jns);
-    Register_JArray(jns);
-    Register_JObject(jns);
-    Register_JValue(jns);
-
-    RootTable(vm).Bind(_SC("SqJSON"), jns);
-
-    Sqrat::ConstTable(vm)
-        .Const(_SC("JSON_OBJECT"),  JSON_OBJECT)
-        .Const(_SC("JSON_ARRAY"),   JSON_ARRAY)
-        .Const(_SC("JSON_STRING"),  JSON_STRING)
-        .Const(_SC("JSON_INTEGER"), JSON_INTEGER)
-        .Const(_SC("JSON_REAL"),    JSON_REAL)
-        .Const(_SC("JSON_TRUE"),    JSON_TRUE)
-        .Const(_SC("JSON_FALSE"),   JSON_FALSE)
-        .Const(_SC("JSON_NULL"),    JSON_NULL);
-}
-
 } // Namespace:: SqMod
 
 // ------------------------------------------------------------------------------------------------
@@ -193,20 +184,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQJSON_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     std::puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQJSON_NAME))
     {
-        OutputError("%s could find the host plug-in", SQJSON_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQJSON_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/mg/Module.cpp b/modules/mg/Module.cpp
index 9a8aaaf7..c83ee76a 100644
--- a/modules/mg/Module.cpp
+++ b/modules/mg/Module.cpp
@@ -11,153 +11,21 @@
 namespace SqMod {
 
 /* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
+ * Register the module API under the obtained virtual machine.
 */
-void RegisterAPI(HSQUIRRELVM vm);
-
-/* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
-*/
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQMG_NAME);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQMG_NAME);
+        // Registration failed
+        return false;
     }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
-    }
-}
 
-/* ------------------------------------------------------------------------------------------------
- * Load the module on the virtual machine provided by the host module.
-*/
-void OnSquirrelLoad()
-{
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
-    {
-        return; // Unable to proceed.
-    }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
-    // Make sure that a valid virtual machine exists
-    if (!_SqVM)
-    {
-        return; // Unable to proceed.
-    }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
-    // Prevent common null objects from using dead virtual machines
-    NullArray() = Array();
-    NullTable() = Table();
-    NullObject() = Object();
-    NullFunction() = Function();
-    // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQMG_NAME);
-}
+    Table mgns;
 
-/* ------------------------------------------------------------------------------------------------
- * The virtual machine is about to be terminated and script resources should be released.
-*/
-void OnSquirrelTerminate()
-{
-    OutputMessage("Terminating: %s", SQMG_NAME);
-    // Release null objects just in case
-    NullObject().Release();
-    NullTable().Release();
-    NullArray().Release();
-    NullFunction().ReleaseGently();
-}
-
-/* ------------------------------------------------------------------------------------------------
- * The virtual machined was closed and all memory associated with it was released.
-*/
-void OnSquirrelReleased()
-{
-    // Release the current virtual machine, if any
-    DefaultVM::Set(nullptr);
-}
-
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQMG_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
-/* ------------------------------------------------------------------------------------------------
- * React to command sent by other plug-ins.
-*/
-static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
-{
-    switch(command_identifier)
-    {
-        case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
-            {
-                OnSquirrelInitialize();
-            }
-        break;
-        case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
-        case SQMOD_TERMINATE_CMD:
-            OnSquirrelTerminate();
-        break;
-        case SQMOD_RELEASED_CMD:
-            OnSquirrelReleased();
-        break;
-        default: break;
-    }
-    return 1;
-}
-
-/* ------------------------------------------------------------------------------------------------
- * The server was initialized and this plug-in was loaded successfully.
-*/
-static uint8_t OnServerInitialise()
-{
-    return 1;
-}
-
-static void OnServerShutdown(void)
-{
-    // The server may still send callbacks
-    _Clbk->OnServerInitialise       = nullptr;
-    _Clbk->OnServerShutdown         = nullptr;
-    _Clbk->OnPluginCommand          = nullptr;
-}
-
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    Table mgns(vm);
-
-    mgns.Bind(_SC("Manager"), Class< Manager >(vm, _SC("SqMgManager"))
+    mgns.Bind(_SC("Manager"), Class< Manager >(mgns,GetVM(), _SC("SqMgManager"))
         // Constructors
         .Ctor()
         .Ctor< const Manager & >()
@@ -176,7 +44,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Overload< Connection (Manager::*)(CSStr, Uint32) const >(_SC("Connect"), &Manager::Connect)
     );
 
-    mgns.Bind(_SC("Connection"), Class< Connection >(vm, _SC("SqMgConnection"))
+    mgns.Bind(_SC("Connection"), Class< Connection >(mgns,GetVM(), _SC("SqMgConnection"))
         // Constructors
         .Ctor()
         .Ctor< const Connection & >()
@@ -190,9 +58,9 @@ void RegisterAPI(HSQUIRRELVM vm)
         //.Func(_SC("Check"), &Connection::Check)
     );
 
-    RootTable(vm).Bind(_SC("SqMg"), mgns);
+    RootTable().Bind(_SC("SqMg"), mgns);
 
-    ConstTable(vm).Enum(_SC("EMgF"), Enumeration(vm)
+    ConstTable().Enum(_SC("EMgF"), Enumeration()
         .Const(_SC("LISTENING"),                MG_F_LISTENING)
         .Const(_SC("UDP"),                      MG_F_UDP)
         .Const(_SC("RESOLVING"),                MG_F_RESOLVING)
@@ -213,7 +81,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("USER_6"),                   MG_F_USER_6)
     );
 
-    ConstTable(vm).Enum(_SC("MgEv"), Enumeration(vm)
+    ConstTable().Enum(_SC("MgEv"), Enumeration()
         .Const(_SC("UNKNOWN"),                              static_cast< Int32 >(MGEV_UNKNOWN))
         .Const(_SC("POLL"),                                 static_cast< Int32 >(MGCE_POLL))
         .Const(_SC("ACCEPT"),                               static_cast< Int32 >(MGCE_ACCEPT))
@@ -259,7 +127,131 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("COAP_ACK"),                             static_cast< Int32 >(MGCE_COAP_ACK))
         .Const(_SC("COAP_RST"),                             static_cast< Int32 >(MGCE_COAP_RST))
         .Const(_SC("MAX"),                                  static_cast< Int32 >(MGCE_MAX))
-    );              
+    );
+
+    // Registration was successful
+    return true;
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * Load the module on the virtual machine provided by the host module.
+*/
+static bool OnSquirrelLoad()
+{
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
+    {
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQMG_NAME);
+        // Unable to proceed!
+        return false;
+    }
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
+    // Make sure that a valid virtual machine exists
+    if (!DefaultVM::Get())
+    {
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQMG_NAME);
+        // Unable to proceed!
+        return false;
+    }
+    // Prevent common null objects from using dead virtual machines
+    NullArray() = Array();
+    NullTable() = Table();
+    NullObject() = Object();
+    NullFunction() = Function();
+    // Register the module API
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQMG_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The virtual machine is about to be terminated and script resources should be released.
+*/
+static void OnSquirrelTerminate()
+{
+    OutputMessage("Terminating: %s", SQMG_NAME);
+    // Release null objects just in case
+    NullObject().Release();
+    NullTable().Release();
+    NullArray().Release();
+    NullFunction().ReleaseGently();
+    // Release script resources...
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The virtual machined was closed and all memory associated with it was released.
+*/
+static void OnSquirrelReleased()
+{
+    // Release the current virtual machine, if any
+    DefaultVM::Set(nullptr);
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * React to command sent by other plug-ins.
+*/
+static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
+{
+    switch(command_identifier)
+    {
+        case SQMOD_INITIALIZE_CMD:
+        {
+            if (CheckModuleAPIVer(message, SQMG_NAME))
+            {
+                try
+                {
+                    ImportModuleAPI(_Func, SQMG_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
+            }
+        } break;
+        case SQMOD_LOAD_CMD:
+        {
+            return OnSquirrelLoad();
+        } break;
+        case SQMOD_TERMINATE_CMD:
+        {
+            OnSquirrelTerminate();
+        } break;
+        case SQMOD_RELEASED_CMD:
+        {
+            OnSquirrelReleased();
+        } break;
+        default: break;
+    }
+    return 1;
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The server was initialized and this plug-in was loaded successfully.
+*/
+static uint8_t OnServerInitialise()
+{
+    return 1; // Initialization was successful
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
+static void OnServerShutdown(void)
+{
+    // The server may still send callbacks
+    _Clbk->OnServerInitialise       = nullptr;
+    _Clbk->OnServerShutdown         = nullptr;
+    _Clbk->OnPluginCommand          = nullptr;
 }
 
 } // Namespace:: SqMod
@@ -276,20 +268,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQMG_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     std::puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQMG_NAME))
     {
-        OutputError("%s could find the host plug-in", SQMG_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQMG_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/mmdb/EntryDataList.cpp b/modules/mmdb/EntryDataList.cpp
index 2143d227..a5fb308d 100644
--- a/modules/mmdb/EntryDataList.cpp
+++ b/modules/mmdb/EntryDataList.cpp
@@ -314,11 +314,11 @@ Object EntryDataList::GetLong() const
             STHROWF("Unsupported conversion from (%s) to (uint64)", AsTypeStr(m_Elem->entry_data.type));
     }
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushULongObject(_SqVM, longint);
+    SqMod_PushULongObject(DefaultVM::Get(), longint);
     // Get the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/modules/mmdb/Module.cpp b/modules/mmdb/Module.cpp
index 577a8b86..88ae47c8 100644
--- a/modules/mmdb/Module.cpp
+++ b/modules/mmdb/Module.cpp
@@ -9,67 +9,65 @@
 namespace SqMod {
 
 /* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
+ * Register the module API under the obtained virtual machine.
 */
-void RegisterAPI(HSQUIRRELVM vm);
-
-/* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
-*/
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQMMDB_NAME);
-    }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQMMDB_NAME);
+        // Registration failed
+        return false;
     }
+
+    // Registration was successful
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * Load the module on the virtual machine provided by the host module.
 */
-void OnSquirrelLoad()
+static bool OnSquirrelLoad()
 {
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
     {
-        return; // Unable to proceed.
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQMMDB_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
     // Make sure that a valid virtual machine exists
-    if (!_SqVM)
+    if (!DefaultVM::Get())
     {
-        return; // Unable to proceed.
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQMMDB_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
     // Prevent common null objects from using dead virtual machines
     NullArray() = Array();
     NullTable() = Table();
     NullObject() = Object();
     NullFunction() = Function();
     // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQMMDB_NAME);
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQMMDB_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machine is about to be terminated and script resources should be released.
 */
-void OnSquirrelTerminate()
+static void OnSquirrelTerminate()
 {
     OutputMessage("Terminating: %s", SQMMDB_NAME);
     // Release null objects just in case
@@ -77,36 +75,18 @@ void OnSquirrelTerminate()
     NullTable().Release();
     NullArray().Release();
     NullFunction().ReleaseGently();
+    // Release script resources...
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machined was closed and all memory associated with it was released.
 */
-void OnSquirrelReleased()
+static void OnSquirrelReleased()
 {
     // Release the current virtual machine, if any
     DefaultVM::Set(nullptr);
 }
 
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQMMDB_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
 /* ------------------------------------------------------------------------------------------------
  * React to command sent by other plug-ins.
 */
@@ -115,20 +95,33 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
     switch(command_identifier)
     {
         case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
+        {
+            if (CheckModuleAPIVer(message, SQMMDB_NAME))
             {
-                OnSquirrelInitialize();
+                try
+                {
+                    ImportModuleAPI(_Func, SQMMDB_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
             }
-        break;
+        } break;
         case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
+        {
+            return OnSquirrelLoad();
+        } break;
         case SQMOD_TERMINATE_CMD:
+        {
             OnSquirrelTerminate();
-        break;
+        } break;
         case SQMOD_RELEASED_CMD:
+        {
             OnSquirrelReleased();
-        break;
+        } break;
         default: break;
     }
     return 1;
@@ -139,9 +132,12 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
 */
 static uint8_t OnServerInitialise()
 {
-    return 1;
+    return 1; // Initialization was successful
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
 static void OnServerShutdown(void)
 {
     // The server may still send callbacks
@@ -150,12 +146,6 @@ static void OnServerShutdown(void)
     _Clbk->OnPluginCommand          = nullptr;
 }
 
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-
-}
-
 } // Namespace:: SqMod
 
 // ------------------------------------------------------------------------------------------------
@@ -170,20 +160,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQMMDB_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQMMDB_NAME))
     {
-        OutputError("%s could find the host plug-in", SQMMDB_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (host_plugin_id > (info->nPluginId))
-    {
-        OutputError("%s loaded after the host plug-in", SQMMDB_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/mysql/Common.cpp b/modules/mysql/Common.cpp
index 96f95233..70f631f8 100644
--- a/modules/mysql/Common.cpp
+++ b/modules/mysql/Common.cpp
@@ -18,11 +18,11 @@ void SqDateToMySQLTime(Object & obj, MYSQL_TIME & t)
     uint8_t month = 0, day = 0;
     {
         // Obtain the initial stack size
-        const StackGuard sg(_SqVM);
+        const StackGuard sg;
         // Push the specified object onto the stack
-        Var< Object >::push(_SqVM, obj);
+        Var< Object >::push(DefaultVM::Get(), obj);
         // Attempt to get the values inside the specified object
-        if (SQ_FAILED(SqMod_GetDate(_SqVM, -1, &year, &month, &day)))
+        if (SQ_FAILED(SqMod_GetDate(DefaultVM::Get(), -1, &year, &month, &day)))
         {
             STHROWF("Invalid date specified");
         }
@@ -47,11 +47,11 @@ void SqTimeToMySQLTime(Object & obj, MYSQL_TIME & t)
     uint16_t milli = 0;
     {
         // Obtain the initial stack size
-        const StackGuard sg(_SqVM);
+        const StackGuard sg;
         // Push the specified object onto the stack
-        Var< Object >::push(_SqVM, obj);
+        Var< Object >::push(DefaultVM::Get(), obj);
         // Attempt to get the values inside the specified object
-        if (SQ_FAILED(SqMod_GetTime(_SqVM, -1, &hour, &minute, &second, &milli)))
+        if (SQ_FAILED(SqMod_GetTime(DefaultVM::Get(), -1, &hour, &minute, &second, &milli)))
         {
             STHROWF("Invalid time specified");
         }
@@ -73,11 +73,11 @@ void SqDatetimeToMySQLTime(Object & obj, MYSQL_TIME & t)
     uint8_t month = 0, day = 0,  hour = 0, minute = 0, second = 0;
     {
         // Obtain the initial stack size
-        const StackGuard sg(_SqVM);
+        const StackGuard sg;
         // Push the specified object onto the stack
-        Var< Object >::push(_SqVM, obj);
+        Var< Object >::push(DefaultVM::Get(), obj);
         // Attempt to get the values inside the specified object
-        if (SQ_FAILED(SqMod_GetDatetime(_SqVM, -1, &year, &month, &day, &hour, &minute, &second, &milli)))
+        if (SQ_FAILED(SqMod_GetDatetime(DefaultVM::Get(), -1, &year, &month, &day, &hour, &minute, &second, &milli)))
         {
             STHROWF("Invalid date and time specified");
         }
diff --git a/modules/mysql/Module.cpp b/modules/mysql/Module.cpp
index ad41de74..681f80b0 100644
--- a/modules/mysql/Module.cpp
+++ b/modules/mysql/Module.cpp
@@ -8,68 +8,81 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
-/* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
-*/
-void RegisterAPI(HSQUIRRELVM vm);
+// ------------------------------------------------------------------------------------------------
+extern void Register_Account(Table & sqlns);
+extern void Register_Connection(Table & sqlns);
+extern void Register_ResultSet(Table & sqlns);
+extern void Register_Statement(Table & sqlns);
 
 /* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
+ * Register the module API under the obtained virtual machine.
 */
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQMYSQL_NAME);
-    }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQMYSQL_NAME);
+        // Registration failed
+        return false;
     }
+
+    Table sqlns;
+
+    Register_Account(sqlns);
+    Register_Connection(sqlns);
+    Register_ResultSet(sqlns);
+    Register_Statement(sqlns);
+
+    RootTable().Bind(_SC("SqMySQL"), sqlns);
+
+    // Registration was successful
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * Load the module on the virtual machine provided by the host module.
 */
-void OnSquirrelLoad()
+static bool OnSquirrelLoad()
 {
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
     {
-        return; // Unable to proceed.
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQMYSQL_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
     // Make sure that a valid virtual machine exists
-    if (!_SqVM)
+    if (!DefaultVM::Get())
     {
-        return; // Unable to proceed.
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQMYSQL_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
     // Prevent common null objects from using dead virtual machines
     NullArray() = Array();
     NullTable() = Table();
     NullObject() = Object();
     NullFunction() = Function();
     // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQMYSQL_NAME);
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQMYSQL_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machine is about to be terminated and script resources should be released.
 */
-void OnSquirrelTerminate()
+static void OnSquirrelTerminate()
 {
     OutputMessage("Terminating: %s", SQMYSQL_NAME);
     // Release null objects just in case
@@ -77,36 +90,18 @@ void OnSquirrelTerminate()
     NullTable().Release();
     NullArray().Release();
     NullFunction().ReleaseGently();
+    // Release script resources...
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machined was closed and all memory associated with it was released.
 */
-void OnSquirrelReleased()
+static void OnSquirrelReleased()
 {
     // Release the current virtual machine, if any
     DefaultVM::Set(nullptr);
 }
 
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQMYSQL_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
 /* ------------------------------------------------------------------------------------------------
  * React to command sent by other plug-ins.
 */
@@ -115,20 +110,33 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
     switch(command_identifier)
     {
         case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
+        {
+            if (CheckModuleAPIVer(message, SQMYSQL_NAME))
             {
-                OnSquirrelInitialize();
+                try
+                {
+                    ImportModuleAPI(_Func, SQMYSQL_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
             }
-        break;
+        } break;
         case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
+        {
+            return OnSquirrelLoad();
+        } break;
         case SQMOD_TERMINATE_CMD:
+        {
             OnSquirrelTerminate();
-        break;
+        } break;
         case SQMOD_RELEASED_CMD:
+        {
             OnSquirrelReleased();
-        break;
+        } break;
         default: break;
     }
     return 1;
@@ -139,9 +147,12 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
 */
 static uint8_t OnServerInitialise()
 {
-    return 1;
+    return 1; // Initialization was successful
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
 static void OnServerShutdown(void)
 {
     // The server may still send callbacks
@@ -150,25 +161,6 @@ static void OnServerShutdown(void)
     _Clbk->OnPluginCommand          = nullptr;
 }
 
-// ------------------------------------------------------------------------------------------------
-extern void Register_Account(Table & sqlns);
-extern void Register_Connection(Table & sqlns);
-extern void Register_ResultSet(Table & sqlns);
-extern void Register_Statement(Table & sqlns);
-
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    Table sqlns(vm);
-
-    Register_Account(sqlns);
-    Register_Connection(sqlns);
-    Register_ResultSet(sqlns);
-    Register_Statement(sqlns);
-
-    RootTable(vm).Bind(_SC("SqMySQL"), sqlns);
-}
-
 } // Namespace:: SqMod
 
 // ------------------------------------------------------------------------------------------------
@@ -183,20 +175,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQMYSQL_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     std::puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQMYSQL_NAME))
     {
-        OutputError("%s could find the host plug-in", SQMYSQL_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQMYSQL_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/mysql/Parameter.hpp b/modules/mysql/Parameter.hpp
index 4c17d48f..b564bc75 100644
--- a/modules/mysql/Parameter.hpp
+++ b/modules/mysql/Parameter.hpp
@@ -8,9 +8,43 @@
 namespace SqMod {
 
 /* ------------------------------------------------------------------------------------------------
- *
+ * ...
 */
+class Parameter
+{
+public:
 
+    /* --------------------------------------------------------------------------------------------
+     * Default constructor.
+    */
+    Parameter();
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy constructor.
+    */
+    Parameter(const Parameter & o);
+
+    /* --------------------------------------------------------------------------------------------
+     * Move constructor.
+    */
+    Parameter(Parameter && o);
+
+    /* --------------------------------------------------------------------------------------------
+     * Destructor.
+    */
+    ~Parameter();
+
+    /* --------------------------------------------------------------------------------------------
+     * Copy assignment operator.
+    */
+    Parameter & operator = (const Parameter & o);
+
+    /* --------------------------------------------------------------------------------------------
+     * Move assignment operator.
+    */
+    Parameter & operator = (Parameter && o);
+
+};
 
 } // Namespace:: SqMod
 
diff --git a/modules/sample/Module.cpp b/modules/sample/Module.cpp
index 4e0cdf5e..174cced4 100644
--- a/modules/sample/Module.cpp
+++ b/modules/sample/Module.cpp
@@ -9,67 +9,75 @@
 namespace SqMod {
 
 /* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
+ * Register the module API under the obtained virtual machine.
 */
-void RegisterAPI(HSQUIRRELVM vm);
-
-/* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
-*/
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQSAMPLE_NAME);
-    }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQSAMPLE_NAME);
+        // Registration failed
+        return false;
     }
+
+    RootTable().Bind(_SC("SampleType"), Class< SampleType >(DefaultVM::Get(), _SC("SampleType"))
+        .Ctor()
+        .Ctor< int >()
+        .Var(_SC("MyNum"), &SampleType::mMyNum)
+        .Prop(_SC("MyVal"), &SampleType::GetMyVal, &SampleType::SetMyVal)
+        .Func(_SC("SampleMethod"), &SampleType::SampleMethod)
+    );
+
+    RootTable().Func(_SC("SampleFunction"), &SampleFunction);
+
+    // Registration was successful
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * Load the module on the virtual machine provided by the host module.
 */
-void OnSquirrelLoad()
+static bool OnSquirrelLoad()
 {
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
     {
-        return; // Unable to proceed.
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQSAMPLE_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
     // Make sure that a valid virtual machine exists
-    if (!_SqVM)
+    if (!DefaultVM::Get())
     {
-        return; // Unable to proceed.
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQSAMPLE_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
     // Prevent common null objects from using dead virtual machines
     NullArray() = Array();
     NullTable() = Table();
     NullObject() = Object();
     NullFunction() = Function();
     // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQSAMPLE_NAME);
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQSAMPLE_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machine is about to be terminated and script resources should be released.
 */
-void OnSquirrelTerminate()
+static void OnSquirrelTerminate()
 {
     OutputMessage("Terminating: %s", SQSAMPLE_NAME);
     // Release null objects just in case
@@ -83,31 +91,12 @@ void OnSquirrelTerminate()
 /* ------------------------------------------------------------------------------------------------
  * The virtual machined was closed and all memory associated with it was released.
 */
-void OnSquirrelReleased()
+static void OnSquirrelReleased()
 {
     // Release the current virtual machine, if any
     DefaultVM::Set(nullptr);
 }
 
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQSAMPLE_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
 /* ------------------------------------------------------------------------------------------------
  * React to command sent by other plug-ins.
 */
@@ -116,20 +105,33 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
     switch(command_identifier)
     {
         case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
+        {
+            if (CheckModuleAPIVer(message, SQSAMPLE_NAME))
             {
-                OnSquirrelInitialize();
+                try
+                {
+                    ImportModuleAPI(_Func, SQSAMPLE_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
             }
-        break;
+        } break;
         case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
+        {
+            return OnSquirrelLoad();
+        } break;
         case SQMOD_TERMINATE_CMD:
+        {
             OnSquirrelTerminate();
-        break;
+        } break;
         case SQMOD_RELEASED_CMD:
+        {
             OnSquirrelReleased();
-        break;
+        } break;
         default: break;
     }
     return 1;
@@ -140,9 +142,12 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
 */
 static uint8_t OnServerInitialise()
 {
-    return 1;
+    return 1; // Initialization was successful
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
 static void OnServerShutdown(void)
 {
     // The server may still send callbacks
@@ -151,20 +156,6 @@ static void OnServerShutdown(void)
     _Clbk->OnPluginCommand          = nullptr;
 }
 
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    RootTable(vm).Bind(_SC("SampleType"), Class< SampleType >(vm, _SC("SampleType"))
-        .Ctor()
-        .Ctor< int >()
-        .Var(_SC("MyNum"), &SampleType::mMyNum)
-        .Prop(_SC("MyVal"), &SampleType::GetMyVal, &SampleType::SetMyVal)
-        .Func(_SC("SampleMethod"), &SampleType::SampleMethod)
-    );
-
-    RootTable(vm).Func(_SC("SampleFunction"), &SampleFunction);
-}
-
 } // Namespace:: SqMod
 
 // ------------------------------------------------------------------------------------------------
@@ -179,20 +170,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQSAMPLE_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     std::puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQSAMPLE_NAME))
     {
-        OutputError("%s could find the host plug-in", SQSAMPLE_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQSAMPLE_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/sqlite/Column.cpp b/modules/sqlite/Column.cpp
index c3753bd8..7d318422 100644
--- a/modules/sqlite/Column.cpp
+++ b/modules/sqlite/Column.cpp
@@ -430,12 +430,12 @@ Object Column::GetString() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the column text on the stack
-    sq_pushstring(_SqVM, reinterpret_cast< CSStr >(sqlite3_column_text(m_Handle->mPtr, m_Index)),
+    sq_pushstring(DefaultVM::Get(), reinterpret_cast< CSStr >(sqlite3_column_text(m_Handle->mPtr, m_Index)),
                             sqlite3_column_bytes(m_Handle->mPtr, m_Index));
     // Get the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -470,7 +470,7 @@ Object Column::GetBuffer() const
         STHROWF("Unable to allocate buffer of at least (%d) bytes", size);
     }
     // Get the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -478,11 +478,11 @@ Object Column::GetBlob() const
 {
     SQMOD_VALIDATE_ROW(*this);
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Obtain the size of the data
     const Int32 sz = sqlite3_column_bytes(m_Handle->mPtr, m_Index);
     // Allocate a blob of the same size
-    SQUserPointer p = sqstd_createblob(_SqVM, sz);
+    SQUserPointer p = sqstd_createblob(DefaultVM::Get(), sz);
     // Obtain a pointer to the data
     const void * b = sqlite3_column_blob(m_Handle->mPtr, m_Index);
     // Could the memory blob be allocated?
@@ -494,9 +494,9 @@ Object Column::GetBlob() const
     else if (!b)
     {
         // Pop the memory blob from the stack
-        sq_pop(_SqVM, 1);
+        sq_pop(DefaultVM::Get(), 1);
         // Push a null value instead
-        sq_pushnull(_SqVM);
+        sq_pushnull(DefaultVM::Get());
     }
     // Copy the data into the memory blob
     else
@@ -504,7 +504,7 @@ Object Column::GetBlob() const
         std::memcpy(p, b, sz);
     }
     // Get the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ================================================================================================
diff --git a/modules/sqlite/Common.cpp b/modules/sqlite/Common.cpp
index 97401619..0cdef247 100644
--- a/modules/sqlite/Common.cpp
+++ b/modules/sqlite/Common.cpp
@@ -82,22 +82,22 @@ Int32 ReleaseMemory(Int32 bytes)
 Object GetMemoryUsage()
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushSLongObject(_SqVM, sqlite3_memory_used());
+    SqMod_PushSLongObject(DefaultVM::Get(), sqlite3_memory_used());
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 Object GetMemoryHighwaterMark(bool reset)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushSLongObject(_SqVM, sqlite3_memory_highwater(reset));
+    SqMod_PushSLongObject(DefaultVM::Get(), sqlite3_memory_highwater(reset));
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
diff --git a/modules/sqlite/Module.cpp b/modules/sqlite/Module.cpp
index b774b3c9..cb0be190 100644
--- a/modules/sqlite/Module.cpp
+++ b/modules/sqlite/Module.cpp
@@ -8,68 +8,87 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
-/* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
-*/
-void RegisterAPI(HSQUIRRELVM vm);
+// ------------------------------------------------------------------------------------------------
+extern void Register_Constants(Table & sqlns);
+extern void Register_Common(Table & sqlns);
+extern void Register_Connection(Table & sqlns);
+extern void Register_Statement(Table & sqlns);
+extern void Register_Parameter(Table & sqlns);
+extern void Register_Column(Table & sqlns);
+extern void Register_Transaction(Table & sqlns);
 
 /* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
+ * Register the module API under the obtained virtual machine.
 */
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQSQLITE_NAME);
-    }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQSQLITE_NAME);
+        // Registration failed
+        return false;
     }
+
+    Table sqlns;
+
+    Register_Constants(sqlns);
+    Register_Common(sqlns);
+    Register_Connection(sqlns);
+    Register_Statement(sqlns);
+    Register_Parameter(sqlns);
+    Register_Column(sqlns);
+    Register_Transaction(sqlns);
+
+    RootTable().Bind(_SC("SQLite"), sqlns);
+
+    // Registration was successful
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * Load the module on the virtual machine provided by the host module.
 */
-void OnSquirrelLoad()
+static bool OnSquirrelLoad()
 {
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
     {
-        return; // Unable to proceed!
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQSQLITE_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
     // Make sure that a valid virtual machine exists
-    if (!_SqVM)
+    if (!DefaultVM::Get())
     {
-        return; // Unable to proceed!
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQSQLITE_NAME);
+        // Unable to proceed!
+        return false;
     }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
     // Prevent common null objects from using dead virtual machines
     NullArray() = Array();
     NullTable() = Table();
     NullObject() = Object();
     NullFunction() = Function();
     // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQSQLITE_NAME);
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQSQLITE_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machine is about to be terminated and script resources should be released.
 */
-void OnSquirrelTerminate()
+static void OnSquirrelTerminate()
 {
     OutputMessage("Terminating: %s", SQSQLITE_NAME);
     // Release null objects just in case
@@ -77,36 +96,18 @@ void OnSquirrelTerminate()
     NullTable().Release();
     NullArray().Release();
     NullFunction().ReleaseGently();
+    // Release script resources...
 }
 
 /* ------------------------------------------------------------------------------------------------
  * The virtual machined was closed and all memory associated with it was released.
 */
-void OnSquirrelReleased()
+static void OnSquirrelReleased()
 {
     // Release the current virtual machine, if any
     DefaultVM::Set(nullptr);
 }
 
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQSQLITE_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
 /* ------------------------------------------------------------------------------------------------
  * React to command sent by other plug-ins.
 */
@@ -115,20 +116,33 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
     switch(command_identifier)
     {
         case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
+        {
+            if (CheckModuleAPIVer(message, SQSQLITE_NAME))
             {
-                OnSquirrelInitialize();
+                try
+                {
+                    ImportModuleAPI(_Func, SQSQLITE_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
             }
-        break;
+        } break;
         case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
+        {
+            return OnSquirrelLoad();
+        } break;
         case SQMOD_TERMINATE_CMD:
+        {
             OnSquirrelTerminate();
-        break;
+        } break;
         case SQMOD_RELEASED_CMD:
+        {
             OnSquirrelReleased();
-        break;
+        } break;
         default: break;
     }
     return 1;
@@ -139,9 +153,12 @@ static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
 */
 static uint8_t OnServerInitialise()
 {
-    return 1;
+    return 1; // Initialization was successful
 }
 
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
 static void OnServerShutdown(void)
 {
     // The server may still send callbacks
@@ -150,31 +167,6 @@ static void OnServerShutdown(void)
     _Clbk->OnPluginCommand          = nullptr;
 }
 
-// ------------------------------------------------------------------------------------------------
-extern void Register_Constants(Table & sqlns);
-extern void Register_Common(Table & sqlns);
-extern void Register_Connection(Table & sqlns);
-extern void Register_Statement(Table & sqlns);
-extern void Register_Parameter(Table & sqlns);
-extern void Register_Column(Table & sqlns);
-extern void Register_Transaction(Table & sqlns);
-
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    Table sqlns(vm);
-
-    Register_Constants(sqlns);
-    Register_Common(sqlns);
-    Register_Connection(sqlns);
-    Register_Statement(sqlns);
-    Register_Parameter(sqlns);
-    Register_Column(sqlns);
-    Register_Transaction(sqlns);
-
-    RootTable(vm).Bind(_SC("SQLite"), sqlns);
-}
-
 } // Namespace:: SqMod
 
 // ------------------------------------------------------------------------------------------------
@@ -189,20 +181,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQSQLITE_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQSQLITE_NAME))
     {
-        OutputError("%s could find the host plug-in", SQSQLITE_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQSQLITE_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/xml/Attribute.cpp b/modules/xml/Attribute.cpp
index 4328773d..1038bc1f 100644
--- a/modules/xml/Attribute.cpp
+++ b/modules/xml/Attribute.cpp
@@ -16,53 +16,53 @@ SQInteger Attribute::Typename(HSQUIRRELVM vm)
 Object Attribute::AsLong(Object & def) const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object >::push(_SqVM, def);
+    Var< Object >::push(DefaultVM::Get(), def);
     // The resulted long integer value
     Int64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetSLongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetSLongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushSLongObject(_SqVM, m_Attr.as_llong(longint));
+    SqMod_PushSLongObject(DefaultVM::Get(), m_Attr.as_llong(longint));
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 Object Attribute::AsUlong(Object & def) const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object >::push(_SqVM, def);
+    Var< Object >::push(DefaultVM::Get(), def);
     // The resulted long integer value
     Uint64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetULongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetULongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushULongObject(_SqVM, m_Attr.as_ullong(longint));
+    SqMod_PushULongObject(DefaultVM::Get(), m_Attr.as_ullong(longint));
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 bool Attribute::ApplyLong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Int64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetSLongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetSLongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
@@ -74,13 +74,13 @@ bool Attribute::ApplyLong(Object & value)
 bool Attribute::ApplyUlong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Uint64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetULongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetULongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
@@ -92,24 +92,24 @@ bool Attribute::ApplyUlong(Object & value)
 Object Attribute::GetLong() const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushSLongObject(_SqVM, m_Attr.as_llong());
+    SqMod_PushSLongObject(DefaultVM::Get(), m_Attr.as_llong());
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 void Attribute::SetLong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Int64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetSLongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetSLongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
@@ -121,24 +121,24 @@ void Attribute::SetLong(Object & value)
 Object Attribute::GetUlong() const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushULongObject(_SqVM, m_Attr.as_ullong());
+    SqMod_PushULongObject(DefaultVM::Get(), m_Attr.as_ullong());
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 void Attribute::SetUlong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Uint64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetULongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetULongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
diff --git a/modules/xml/Module.cpp b/modules/xml/Module.cpp
index 204461e1..5186f412 100644
--- a/modules/xml/Module.cpp
+++ b/modules/xml/Module.cpp
@@ -14,153 +14,21 @@
 namespace SqMod {
 
 /* ------------------------------------------------------------------------------------------------
- * Register the module API under the specified virtual machine.
+ * Register the module API under the obtained virtual machine.
 */
-void RegisterAPI(HSQUIRRELVM vm);
-
-/* ------------------------------------------------------------------------------------------------
- * Initialize the plug-in by obtaining the API provided by the host plug-in.
-*/
-void OnSquirrelInitialize()
+static bool RegisterAPI()
 {
-    // Attempt to import the plug-in API exported by the host plug-in
-    _SqMod = sq_api_import(_Func);
-    // Did we failed to obtain the plug-in exports?
-    if (!_SqMod)
+    // Make sure there's a valid virtual machine before proceeding
+    if (!DefaultVM::Get())
     {
-        OutputError("Failed to attach [%s] on host plug-in.", SQXML_NAME);
+        OutputError("%s: Cannot register API without a valid virtual machine", SQXML_NAME);
+        // Registration failed
+        return false;
     }
-    else
-    {
-        // Expand the Squirrel plug-in API into global functions
-        sqmod_api_expand(_SqMod);
-        // Obtain the Squirrel API
-        _SqAPI = SqMod_GetSquirrelAPI();
-        // Expand the Squirrel API into global functions
-        sq_api_expand(_SqAPI);
-    }
-}
 
-/* ------------------------------------------------------------------------------------------------
- * Load the module on the virtual machine provided by the host module.
-*/
-void OnSquirrelLoad()
-{
-    // Make sure that we have a valid plug-in API
-    if (!_SqMod)
-    {
-        return; // Unable to proceed!
-    }
-    // Obtain the Squirrel API and VM
-    _SqVM = SqMod_GetSquirrelVM();
-    // Make sure that a valid virtual machine exists
-    if (!_SqVM)
-    {
-        return; // Unable to proceed!
-    }
-    // Set this as the default database
-    DefaultVM::Set(_SqVM);
-    // Prevent common null objects from using dead virtual machines
-    NullArray() = Array();
-    NullTable() = Table();
-    NullObject() = Object();
-    NullFunction() = Function();
-    // Register the module API
-    RegisterAPI(_SqVM);
-    // Notify about the current status
-    OutputMessage("Registered: %s", SQXML_NAME);
-}
+    Table xmlns;
 
-/* ------------------------------------------------------------------------------------------------
- * The virtual machine is about to be terminated and script resources should be released.
-*/
-void OnSquirrelTerminate()
-{
-    OutputMessage("Terminating: %s", SQXML_NAME);
-    // Release null objects just in case
-    NullObject().Release();
-    NullTable().Release();
-    NullArray().Release();
-    NullFunction().ReleaseGently();
-}
-
-/* ------------------------------------------------------------------------------------------------
- * The virtual machined was closed and all memory associated with it was released.
-*/
-void OnSquirrelReleased()
-{
-    // Release the current virtual machine, if any
-    DefaultVM::Set(nullptr);
-}
-
-/* ------------------------------------------------------------------------------------------------
- * Validate the module API to make sure we don't run into issues.
-*/
-bool CheckAPIVer(CCStr ver)
-{
-    // Obtain the numeric representation of the API version
-    const LongI vernum = std::strtol(ver, nullptr, 10);
-    // Check against version mismatch
-    if (vernum == SQMOD_API_VER)
-    {
-        return true;
-    }
-    // Log the incident
-    OutputError("API version mismatch on %s", SQXML_NAME);
-    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
-    // Invoker should not attempt to communicate through the module API
-    return false;
-}
-
-/* ------------------------------------------------------------------------------------------------
- * React to command sent by other plug-ins.
-*/
-static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
-{
-    switch(command_identifier)
-    {
-        case SQMOD_INITIALIZE_CMD:
-            if (CheckAPIVer(message))
-            {
-                OnSquirrelInitialize();
-            }
-        break;
-        case SQMOD_LOAD_CMD:
-            OnSquirrelLoad();
-        break;
-        case SQMOD_TERMINATE_CMD:
-            OnSquirrelTerminate();
-        break;
-        case SQMOD_RELEASED_CMD:
-            OnSquirrelReleased();
-        break;
-        default: break;
-    }
-    return 1;
-}
-
-/* ------------------------------------------------------------------------------------------------
- * The server was initialized and this plug-in was loaded successfully.
-*/
-static uint8_t OnServerInitialise()
-{
-    return 1;
-}
-
-static void OnServerShutdown(void)
-{
-    // The server may still send callbacks
-    _Clbk->OnServerInitialise       = nullptr;
-    _Clbk->OnServerShutdown         = nullptr;
-    _Clbk->OnPluginCommand          = nullptr;
-}
-
-// ------------------------------------------------------------------------------------------------
-void RegisterAPI(HSQUIRRELVM vm)
-{
-    Table xmlns(vm);
-
-    xmlns.Bind(_SC("ParseResult"), Class< ParseResult >(vm, _SC("SqXmlParseResult"))
+    xmlns.Bind(_SC("ParseResult"), Class< ParseResult >(xmlns.GetVM(), _SC("SqXmlParseResult"))
         // Constructors
         .Ctor()
         .Ctor< const ParseResult & >()
@@ -180,7 +48,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Func(_SC("Check"), &ParseResult::Check)
     );
 
-    xmlns.Bind(_SC("Attribute"), Class< Attribute >(vm, _SC("SqXmlAttribute"))
+    xmlns.Bind(_SC("Attribute"), Class< Attribute >(xmlns.GetVM(), _SC("SqXmlAttribute"))
         // Constructors
         .Ctor()
         .Ctor< const Attribute & >()
@@ -225,7 +93,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Func(_SC("SetBool"), &Attribute::ApplyBool)
     );
 
-    xmlns.Bind(_SC("Text"), Class< Text >(vm, _SC("SqXmlText"))
+    xmlns.Bind(_SC("Text"), Class< Text >(xmlns.GetVM(), _SC("SqXmlText"))
         // Constructors
         .Ctor()
         .Ctor< const Text & >()
@@ -265,7 +133,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Func(_SC("SetBool"), &Text::ApplyBool)
     );
 
-    xmlns.Bind(_SC("Node"), Class< Node >(vm, _SC("SqXmlNode"))
+    xmlns.Bind(_SC("Node"), Class< Node >(xmlns.GetVM(), _SC("SqXmlNode"))
         // Constructors
         .Ctor()
         .Ctor< const Node & >()
@@ -341,7 +209,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Func(_SC("FindElemByPath"), &Node::FindElemByPath)
     );
 
-    xmlns.Bind(_SC("Document"), Class< Document, NoCopy< Document > >(vm, _SC("SqXmlDocument"))
+    xmlns.Bind(_SC("Document"), Class< Document, NoCopy< Document > >(xmlns.GetVM(), _SC("SqXmlDocument"))
         // Constructors
         .Ctor()
         // Core Meta-methods
@@ -366,9 +234,9 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Overload< void (Document::*)(CSStr, CSStr, Uint32, Int32) >(_SC("SaveFile"), &Document::SaveFile)
     );
 
-    RootTable(vm).Bind(_SC("SqXml"), xmlns);
+    RootTable().Bind(_SC("SqXml"), xmlns);
 
-    ConstTable(vm).Enum(_SC("SqXmlNodeType"), Enumeration(vm)
+    ConstTable().Enum(_SC("SqXmlNodeType"), Enumeration()
         .Const(_SC("Null"),                     static_cast< Int32 >(node_null))
         .Const(_SC("Document"),                 static_cast< Int32 >(node_document))
         .Const(_SC("Element"),                  static_cast< Int32 >(node_element))
@@ -380,7 +248,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("Doctype"),                  static_cast< Int32 >(node_doctype))
     );
 
-    ConstTable(vm).Enum(_SC("SqXmlParse"), Enumeration(vm)
+    ConstTable().Enum(_SC("SqXmlParse"), Enumeration()
         .Const(_SC("Minimal"),                  static_cast< Int32 >(parse_minimal))
         .Const(_SC("Default"),                  static_cast< Int32 >(parse_default))
         .Const(_SC("Full"),                     static_cast< Int32 >(parse_full))
@@ -400,7 +268,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("EmbedPCData"),              static_cast< Int32 >(parse_embed_pcdata))
     );
 
-    ConstTable(vm).Enum(_SC("SqXmlEncoding"), Enumeration(vm)
+    ConstTable().Enum(_SC("SqXmlEncoding"), Enumeration()
         .Const(_SC("Auto"),                     static_cast< Int32 >(encoding_auto))
         .Const(_SC("Utf8"),                     static_cast< Int32 >(encoding_utf8))
         .Const(_SC("Utf16LE"),                  static_cast< Int32 >(encoding_utf16_le))
@@ -413,7 +281,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("Latin1"),                   static_cast< Int32 >(encoding_latin1))
     );
 
-    ConstTable(vm).Enum(_SC("SqXmlFormat"), Enumeration(vm)
+    ConstTable().Enum(_SC("SqXmlFormat"), Enumeration()
         .Const(_SC("Indent"),                   static_cast< Int32 >(format_indent))
         .Const(_SC("WriteBOM"),                 static_cast< Int32 >(format_write_bom))
         .Const(_SC("Raw"),                      static_cast< Int32 >(format_raw))
@@ -424,7 +292,7 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("Default"),                  static_cast< Int32 >(format_default))
     );
 
-    ConstTable(vm).Enum(_SC("SqXmlParseStatus"), Enumeration(vm)
+    ConstTable().Enum(_SC("SqXmlParseStatus"), Enumeration()
         .Const(_SC("Ok"),                       static_cast< Int32 >(status_ok))
         .Const(_SC("FileNotFound"),             static_cast< Int32 >(status_file_not_found))
         .Const(_SC("IOError"),                  static_cast< Int32 >(status_io_error))
@@ -444,13 +312,137 @@ void RegisterAPI(HSQUIRRELVM vm)
         .Const(_SC("NoDocumentElement"),        static_cast< Int32 >(status_no_document_element))
     );
 
-    ConstTable(vm).Enum(_SC("SqXmlXpathValueType"), Enumeration(vm)
+    ConstTable().Enum(_SC("SqXmlXpathValueType"), Enumeration()
         .Const(_SC("None"),                     static_cast< Int32 >(xpath_type_none))
         .Const(_SC("NodeSet"),                  static_cast< Int32 >(xpath_type_node_set))
         .Const(_SC("Number"),                   static_cast< Int32 >(xpath_type_number))
         .Const(_SC("String"),                   static_cast< Int32 >(xpath_type_string))
         .Const(_SC("Boolean"),                  static_cast< Int32 >(xpath_type_boolean))
     );
+
+    // Registration was successful
+    return true;
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * Load the module on the virtual machine provided by the host module.
+*/
+static bool OnSquirrelLoad()
+{
+    // Make sure that we have a valid module API
+    if (!SqMod_GetSquirrelVM)
+    {
+        OutputError("%s: Cannot obtain the Squirrel virtual machine without the module API", SQXML_NAME);
+        // Unable to proceed!
+        return false;
+    }
+    // Obtain the Squirrel virtual machine from the host plug-in
+    DefaultVM::Set(SqMod_GetSquirrelVM());
+    // Make sure that a valid virtual machine exists
+    if (!DefaultVM::Get())
+    {
+        OutputError("%s: Squirrel virtual machine obtained from the host plug-in is invalid", SQXML_NAME);
+        // Unable to proceed!
+        return false;
+    }
+    // Prevent common null objects from using dead virtual machines
+    NullArray() = Array();
+    NullTable() = Table();
+    NullObject() = Object();
+    NullFunction() = Function();
+    // Register the module API
+    if (RegisterAPI())
+    {
+        OutputMessage("Registered: %s", SQXML_NAME);
+    }
+    else
+    {
+        return false;
+    }
+    // At this point, the module was successfully loaded
+    return true;
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The virtual machine is about to be terminated and script resources should be released.
+*/
+static void OnSquirrelTerminate()
+{
+    OutputMessage("Terminating: %s", SQXML_NAME);
+    // Release null objects just in case
+    NullObject().Release();
+    NullTable().Release();
+    NullArray().Release();
+    NullFunction().ReleaseGently();
+    // Release script resources...
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The virtual machined was closed and all memory associated with it was released.
+*/
+static void OnSquirrelReleased()
+{
+    // Release the current virtual machine, if any
+    DefaultVM::Set(nullptr);
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * React to command sent by other plug-ins.
+*/
+static uint8_t OnPluginCommand(uint32_t command_identifier, CCStr message)
+{
+    switch(command_identifier)
+    {
+        case SQMOD_INITIALIZE_CMD:
+        {
+            if (CheckModuleAPIVer(message, SQXML_NAME))
+            {
+                try
+                {
+                    ImportModuleAPI(_Func, SQXML_NAME);
+                }
+                catch (const Sqrat::Exception & e)
+                {
+                    OutputError("%s", e.what());
+                    // Failed to initialize
+                    return 0;
+                }
+            }
+        } break;
+        case SQMOD_LOAD_CMD:
+        {
+            return OnSquirrelLoad();
+        } break;
+        case SQMOD_TERMINATE_CMD:
+        {
+            OnSquirrelTerminate();
+        } break;
+        case SQMOD_RELEASED_CMD:
+        {
+            OnSquirrelReleased();
+        } break;
+        default: break;
+    }
+    return 1;
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The server was initialized and this plug-in was loaded successfully.
+*/
+static uint8_t OnServerInitialise()
+{
+    return 1; // Initialization was successful
+}
+
+/* ------------------------------------------------------------------------------------------------
+ * The server is about to shutdown gracefully.
+*/
+static void OnServerShutdown(void)
+{
+    // The server may still send callbacks
+    _Clbk->OnServerInitialise       = nullptr;
+    _Clbk->OnServerShutdown         = nullptr;
+    _Clbk->OnPluginCommand          = nullptr;
 }
 
 } // Namespace:: SqMod
@@ -467,20 +459,9 @@ SQMOD_API_EXPORT unsigned int VcmpPluginInit(PluginFuncs * functions, PluginCall
     OutputMessage("Legal: %s", SQXML_COPYRIGHT);
     OutputMessage("--------------------------------------------------------------------");
     puts("");
-    // Attempt to find the host plug-in ID
-    const int host_plugin_id = functions->FindPlugin(SQMOD_HOST_NAME);
-    // See if our plug-in was loaded after the host plug-in
-    if (host_plugin_id < 0)
+    // Make sure that the module was loaded after the host plug-in
+    if (!CheckModuleOrder(functions, info->pluginId, SQXML_NAME))
     {
-        OutputError("%s could find the host plug-in", SQXML_NAME);
-        // Don't load!
-        return SQMOD_FAILURE;
-    }
-    // Should never reach this point but just in case
-    else if (static_cast< Uint32 >(host_plugin_id) > info->pluginId)
-    {
-        OutputError("%s loaded after the host plug-in", SQXML_NAME);
-        // Don't load!
         return SQMOD_FAILURE;
     }
     // Store server proxies
diff --git a/modules/xml/Text.cpp b/modules/xml/Text.cpp
index 0a14cb7a..39d07f85 100644
--- a/modules/xml/Text.cpp
+++ b/modules/xml/Text.cpp
@@ -37,53 +37,53 @@ Int32 Text::Cmp(const Text & o)
 Object Text::AsLong(Object & def) const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object >::push(_SqVM, def);
+    Var< Object >::push(DefaultVM::Get(), def);
     // The resulted long integer value
     Int64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetSLongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetSLongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushSLongObject(_SqVM, m_Text.as_llong(longint));
+    SqMod_PushSLongObject(DefaultVM::Get(), m_Text.as_llong(longint));
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 Object Text::AsUlong(Object & def) const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object >::push(_SqVM, def);
+    Var< Object >::push(DefaultVM::Get(), def);
     // The resulted long integer value
     Uint64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetULongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetULongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushULongObject(_SqVM, m_Text.as_ullong(longint));
+    SqMod_PushULongObject(DefaultVM::Get(), m_Text.as_ullong(longint));
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 bool Text::ApplyLong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Int64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetSLongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetSLongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
@@ -95,13 +95,13 @@ bool Text::ApplyLong(Object & value)
 bool Text::ApplyUlong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Uint64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetULongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetULongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
@@ -113,24 +113,24 @@ bool Text::ApplyUlong(Object & value)
 Object Text::GetLong() const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushSLongObject(_SqVM, m_Text.as_llong());
+    SqMod_PushSLongObject(DefaultVM::Get(), m_Text.as_llong());
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 void Text::SetLong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Int64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetSLongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetSLongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
@@ -142,24 +142,24 @@ void Text::SetLong(Object & value)
 Object Text::GetUlong() const
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push a long integer instance with the requested value on the stack
-    SqMod_PushULongObject(_SqVM, m_Text.as_ullong());
+    SqMod_PushULongObject(DefaultVM::Get(), m_Text.as_ullong());
     // Obtain the object from the stack and return it
-    return Var< Object >(_SqVM, -1).value;
+    return Var< Object >(DefaultVM::Get(), -1).value;
 }
 
 // ------------------------------------------------------------------------------------------------
 void Text::SetUlong(Object & value)
 {
     // Obtain the initial stack size
-    const StackGuard sg(_SqVM);
+    const StackGuard sg;
     // Push the specified object onto the stack
-    Var< Object & >::push(_SqVM, value);
+    Var< Object & >::push(DefaultVM::Get(), value);
     // The resulted long integer value
     Uint64 longint = 0;
     // Attempt to get the numeric value inside the specified object
-    if (SQ_FAILED(SqMod_GetULongValue(_SqVM, -1, &longint)))
+    if (SQ_FAILED(SqMod_GetULongValue(DefaultVM::Get(), -1, &longint)))
     {
         STHROWF("Invalid long integer specified");
     }
diff --git a/shared/Base/Utility.hpp b/shared/Base/Utility.hpp
index 13fb6069..85518b8a 100644
--- a/shared/Base/Utility.hpp
+++ b/shared/Base/Utility.hpp
@@ -33,18 +33,6 @@ extern PluginFuncs*         _Func;
 extern PluginCallbacks*     _Clbk;
 extern PluginInfo*          _Info;
 
-// ------------------------------------------------------------------------------------------------
-#ifdef SQMOD_PLUGIN_API
-
-    /* --------------------------------------------------------------------------------------------
-     * Proxies to comunicate with the Squirrel plug-in.
-    */
-    extern HSQAPI           _SqAPI;
-    extern HSQEXPORTS       _SqMod;
-    extern HSQUIRRELVM      _SqVM;
-
-#endif // SQMOD_PLUGIN_API
-
 /* ------------------------------------------------------------------------------------------------
  * Retrieve the temporary buffer.
 */
@@ -1542,6 +1530,26 @@ Int64 PopStackSLong(HSQUIRRELVM vm, SQInteger idx);
 */
 Uint64 PopStackULong(HSQUIRRELVM vm, SQInteger idx);
 
+// ------------------------------------------------------------------------------------------------
+#ifdef SQMOD_PLUGIN_API
+
+/* ------------------------------------------------------------------------------------------------
+ * Validate the module API to make sure we don't run into issues.
+*/
+bool CheckModuleAPIVer(CCStr ver, CCStr mod);
+
+/* ------------------------------------------------------------------------------------------------
+ * Make sure that the module was loaded after the host plug-in.
+*/
+bool CheckModuleOrder(PluginFuncs * vcapi, Uint32 mod_id, CCStr mod);
+
+/* ------------------------------------------------------------------------------------------------
+ * Used by the modules to import the API from the host plug-in.
+*/
+void ImportModuleAPI(PluginFuncs * vcapi, CCStr mod);
+
+#endif // SQMOD_PLUGIN_API
+
 } // Namespace:: SqMod
 
 #endif // _BASE_UTILITY_HPP_
diff --git a/shared/Base/Utility.inl b/shared/Base/Utility.inl
index acb41a9b..c75f9826 100644
--- a/shared/Base/Utility.inl
+++ b/shared/Base/Utility.inl
@@ -29,15 +29,6 @@ PluginFuncs*        _Func = nullptr;
 PluginCallbacks*    _Clbk = nullptr;
 PluginInfo*         _Info = nullptr;
 
-// ------------------------------------------------------------------------------------------------
-#ifdef SQMOD_PLUGIN_API
-
-    HSQAPI          _SqAPI = nullptr;
-    HSQEXPORTS      _SqMod = nullptr;
-    HSQUIRRELVM     _SqVM = nullptr;
-
-#endif // SQMOD_PLUGIN_API
-
 /* ------------------------------------------------------------------------------------------------
  * Common buffers to reduce memory allocations. To be immediately copied upon return!
 */
@@ -1383,4 +1374,136 @@ Uint64 PopStackULong(HSQUIRRELVM vm, SQInteger idx)
 #endif // SQMOD_PLUGIN_API
 }
 
+// ------------------------------------------------------------------------------------------------
+#ifdef SQMOD_PLUGIN_API
+
+// ------------------------------------------------------------------------------------------------
+bool CheckModuleAPIVer(CCStr ver, CCStr mod)
+{
+    // Obtain the numeric representation of the API version
+    const LongI vernum = std::strtol(ver, nullptr, 10);
+    // Check against version mismatch
+    if (vernum == SQMOD_API_VER)
+    {
+        return true;
+    }
+    // Log the incident
+    OutputError("API version mismatch on %s", mod);
+    OutputMessage("=> Requested: %ld Have: %ld", vernum, SQMOD_API_VER);
+    // Invoker should not attempt to communicate through the module API
+    return false;
+}
+
+// ------------------------------------------------------------------------------------------------
+bool CheckModuleOrder(PluginFuncs * vcapi, Uint32 mod_id, CCStr mod)
+{
+    // Make sure a valid server API was provided
+    if (!vcapi)
+    {
+        OutputError("Invalid pointer to server API structure");
+        // Validation failed!
+        return false;
+    }
+    // Attempt to find the host plug-in identifier
+    const int plugin_id = vcapi->FindPlugin(SQMOD_HOST_NAME);
+    // See if our module was loaded after the host plug-in
+    if (plugin_id < 0)
+    {
+        OutputError("%s: could find the host plug-in", mod);
+        // Validation failed!
+        return false;
+    }
+    // Should never reach this point but just in case
+    else if (static_cast< Uint32 >(plugin_id) > mod_id)
+    {
+        OutputError("%s: loaded after the host plug-in", mod);
+        // Validation failed!
+        return false;
+    }
+    // Loaded in the correct order
+    return true;
+}
+
+// ------------------------------------------------------------------------------------------------
+void ImportModuleAPI(PluginFuncs * vcapi, CCStr mod)
+{
+    // Make sure a valid server API was provided
+    if (!vcapi)
+    {
+        STHROWF("%s: Invalid pointer to server API structure", mod);
+    }
+
+    size_t exports_struct_size;
+
+    // Attempt to find the host plug-in identifier
+    int plugin_id = vcapi->FindPlugin(SQMOD_HOST_NAME);
+    // Validate the obtained plug-in identifier
+    if (plugin_id < 0)
+    {
+        STHROWF("%s: Unable to obtain the host plug-in identifier", mod);
+    }
+
+    // Attempt to retrieve the host plug-in exports
+    const void ** raw_plugin_exports = vcapi->GetPluginExports(plugin_id, &exports_struct_size);
+    // See if the size of the exports structure matches
+    if (exports_struct_size <= 0)
+    {
+        STHROWF("%s: Incompatible host plug-in exports structure", mod);
+    }
+    // See if we have any exports from the host plug-in
+    else if (raw_plugin_exports == nullptr)
+    {
+        STHROWF("%s: Unable to obtain pointer host plug-in exports", mod);
+    }
+
+    // Obtain pointer to the exports structure
+    const SQMODEXPORTS * plugin_exports = *reinterpret_cast< const SQMODEXPORTS ** >(raw_plugin_exports);
+    // See if we have a valid pointer to the exports structure
+    if (plugin_exports == nullptr)
+    {
+        STHROWF("%s: Invalid pointer to host plug-in exports structure", mod);
+    }
+    else if (plugin_exports->PopulateModuleAPI == nullptr || plugin_exports->PopulateSquirrelAPI == nullptr)
+    {
+        STHROWF("%s: Invalid pointer to host plug-in import functions", mod);
+    }
+
+    // Prepare a structure to obtain the module API
+    SQMODAPI sqmodapi;
+    // Attempt to populate the structure
+    switch (plugin_exports->PopulateModuleAPI(&sqmodapi, sizeof(SQMODAPI)))
+    {
+        case -1:    STHROWF("%s: Incompatible module API structure", mod);
+        case 0:     STHROWF("%s: Invalid pointer to module API structure", mod);
+    }
+
+    // Prepare a structure to obtain the squirrel API
+    SQLIBAPI sqlibapi;
+    // Attempt to populate the structure
+    switch (plugin_exports->PopulateSquirrelAPI(&sqlibapi, sizeof(SQLIBAPI)))
+    {
+        case -1:    STHROWF("%s: Incompatible squirrel API structure", mod);
+        case 0:     STHROWF("%s: Invalid pointer to squirrel API structure", mod);
+    }
+
+    // Attempt to expand the obtained API
+    if (!sqmod_api_expand(&sqmodapi))
+    {
+        // Collapse the API first
+        sqmod_api_collapse();
+        // Now it's safe to throw the exception
+        STHROWF("%s: Unable to expand module API structure", mod);
+    }
+    else if (!sqlib_api_expand(&sqlibapi))
+    {
+        // Collapse the API first
+        sqmod_api_collapse();
+        sqlib_api_collapse();
+        // Now it's safe to throw the exception
+        STHROWF("%s: Unable to expand module API structure", mod);
+    }
+}
+
+#endif // SQMOD_PLUGIN_API
+
 } // Namespace:: SqMod
diff --git a/shared/SqAPI.h b/shared/SqAPI.h
index c2767394..6521289b 100644
--- a/shared/SqAPI.h
+++ b/shared/SqAPI.h
@@ -35,558 +35,740 @@ extern "C" {
 #endif
 
     //vm
-    typedef HSQUIRRELVM (*sqapi_open)(SQInteger initialstacksize);
-    typedef HSQUIRRELVM (*sqapi_newthread)(HSQUIRRELVM friendvm, SQInteger initialstacksize);
-    typedef void (*sqapi_seterrorhandler)(HSQUIRRELVM v);
-    typedef void (*sqapi_close)(HSQUIRRELVM v);
-    typedef void (*sqapi_setforeignptr)(HSQUIRRELVM v,SQUserPointer p);
-    typedef SQUserPointer (*sqapi_getforeignptr)(HSQUIRRELVM v);
-    typedef void (*sqapi_setsharedforeignptr)(HSQUIRRELVM v,SQUserPointer p);
-    typedef SQUserPointer (*sqapi_getsharedforeignptr)(HSQUIRRELVM v);
-    typedef void (*sqapi_setvmreleasehook)(HSQUIRRELVM v,SQRELEASEHOOK hook);
-    typedef SQRELEASEHOOK (*sqapi_getvmreleasehook)(HSQUIRRELVM v);
-    typedef void (*sqapi_setsharedreleasehook)(HSQUIRRELVM v,SQRELEASEHOOK hook);
-    typedef SQRELEASEHOOK (*sqapi_getsharedreleasehook)(HSQUIRRELVM v);
-    typedef void (*sqapi_setprintfunc)(HSQUIRRELVM v, SQPRINTFUNCTION printfunc,SQPRINTFUNCTION errfunc);
-    typedef SQPRINTFUNCTION (*sqapi_getprintfunc)(HSQUIRRELVM v);
-    typedef SQPRINTFUNCTION (*sqapi_geterrorfunc)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_suspendvm)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_wakeupvm)(HSQUIRRELVM v,SQBool resumedret,SQBool retval,SQBool raiseerror,SQBool throwerror);
-    typedef SQInteger (*sqapi_getvmstate)(HSQUIRRELVM v);
-    typedef SQInteger (*sqapi_getversion)();
+    typedef HSQUIRRELVM (*SqLibAPI_open)(SQInteger initialstacksize);
+    typedef HSQUIRRELVM (*SqLibAPI_newthread)(HSQUIRRELVM friendvm, SQInteger initialstacksize);
+    typedef void (*SqLibAPI_seterrorhandler)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_close)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_setforeignptr)(HSQUIRRELVM v,SQUserPointer p);
+    typedef SQUserPointer (*SqLibAPI_getforeignptr)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_setsharedforeignptr)(HSQUIRRELVM v,SQUserPointer p);
+    typedef SQUserPointer (*SqLibAPI_getsharedforeignptr)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_setvmreleasehook)(HSQUIRRELVM v,SQRELEASEHOOK hook);
+    typedef SQRELEASEHOOK (*SqLibAPI_getvmreleasehook)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_setsharedreleasehook)(HSQUIRRELVM v,SQRELEASEHOOK hook);
+    typedef SQRELEASEHOOK (*SqLibAPI_getsharedreleasehook)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_setprintfunc)(HSQUIRRELVM v, SQPRINTFUNCTION printfunc,SQPRINTFUNCTION errfunc);
+    typedef SQPRINTFUNCTION (*SqLibAPI_getprintfunc)(HSQUIRRELVM v);
+    typedef SQPRINTFUNCTION (*SqLibAPI_geterrorfunc)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_suspendvm)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_wakeupvm)(HSQUIRRELVM v,SQBool resumedret,SQBool retval,SQBool raiseerror,SQBool throwerror);
+    typedef SQInteger (*SqLibAPI_getvmstate)(HSQUIRRELVM v);
+    typedef SQInteger (*SqLibAPI_getversion)();
 
     //compiler
-    typedef SQRESULT (*sqapi_compile)(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror);
-    typedef SQRESULT (*sqapi_compilebuffer)(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror);
-    typedef void (*sqapi_enabledebuginfo)(HSQUIRRELVM v, SQBool enable);
-    typedef void (*sqapi_notifyallexceptions)(HSQUIRRELVM v, SQBool enable);
-    typedef void (*sqapi_setcompilererrorhandler)(HSQUIRRELVM v,SQCOMPILERERROR f);
+    typedef SQRESULT (*SqLibAPI_compile)(HSQUIRRELVM v,SQLEXREADFUNC read,SQUserPointer p,const SQChar *sourcename,SQBool raiseerror);
+    typedef SQRESULT (*SqLibAPI_compilebuffer)(HSQUIRRELVM v,const SQChar *s,SQInteger size,const SQChar *sourcename,SQBool raiseerror);
+    typedef void (*SqLibAPI_enabledebuginfo)(HSQUIRRELVM v, SQBool enable);
+    typedef void (*SqLibAPI_notifyallexceptions)(HSQUIRRELVM v, SQBool enable);
+    typedef void (*SqLibAPI_setcompilererrorhandler)(HSQUIRRELVM v,SQCOMPILERERROR f);
 
     //stack operations
-    typedef void (*sqapi_push)(HSQUIRRELVM v,SQInteger idx);
-    typedef void (*sqapi_pop)(HSQUIRRELVM v,SQInteger nelemstopop);
-    typedef void (*sqapi_poptop)(HSQUIRRELVM v);
-    typedef void (*sqapi_remove)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQInteger (*sqapi_gettop)(HSQUIRRELVM v);
-    typedef void (*sqapi_settop)(HSQUIRRELVM v,SQInteger newtop);
-    typedef SQRESULT (*sqapi_reservestack)(HSQUIRRELVM v,SQInteger nsize);
-    typedef SQInteger (*sqapi_cmp)(HSQUIRRELVM v);
-    typedef void (*sqapi_move)(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx);
+    typedef void (*SqLibAPI_push)(HSQUIRRELVM v,SQInteger idx);
+    typedef void (*SqLibAPI_pop)(HSQUIRRELVM v,SQInteger nelemstopop);
+    typedef void (*SqLibAPI_poptop)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_remove)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQInteger (*SqLibAPI_gettop)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_settop)(HSQUIRRELVM v,SQInteger newtop);
+    typedef SQRESULT (*SqLibAPI_reservestack)(HSQUIRRELVM v,SQInteger nsize);
+    typedef SQInteger (*SqLibAPI_cmp)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_move)(HSQUIRRELVM dest,HSQUIRRELVM src,SQInteger idx);
 
     //object creation handling
-    typedef SQUserPointer (*sqapi_newuserdata)(HSQUIRRELVM v,SQUnsignedInteger size);
-    typedef void (*sqapi_newtable)(HSQUIRRELVM v);
-    typedef void (*sqapi_newtableex)(HSQUIRRELVM v,SQInteger initialcapacity);
-    typedef void (*sqapi_newarray)(HSQUIRRELVM v,SQInteger size);
-    typedef void (*sqapi_newclosure)(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars);
-    typedef SQRESULT (*sqapi_setparamscheck)(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask);
-    typedef SQRESULT (*sqapi_bindenv)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_setclosureroot)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_getclosureroot)(HSQUIRRELVM v,SQInteger idx);
-    typedef void (*sqapi_pushstring)(HSQUIRRELVM v,const SQChar *s,SQInteger len);
-    typedef void (*sqapi_pushfloat)(HSQUIRRELVM v,SQFloat f);
-    typedef void (*sqapi_pushinteger)(HSQUIRRELVM v,SQInteger n);
-    typedef void (*sqapi_pushbool)(HSQUIRRELVM v,SQBool b);
-    typedef void (*sqapi_pushuserpointer)(HSQUIRRELVM v,SQUserPointer p);
-    typedef void (*sqapi_pushnull)(HSQUIRRELVM v);
-    typedef void (*sqapi_pushthread)(HSQUIRRELVM v, HSQUIRRELVM thread);
-    typedef SQObjectType (*sqapi_gettype)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_typeof)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQInteger (*sqapi_getsize)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQHash (*sqapi_gethash)(HSQUIRRELVM v, SQInteger idx);
-    typedef SQRESULT (*sqapi_getbase)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQBool (*sqapi_instanceof)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_tostring)(HSQUIRRELVM v,SQInteger idx);
-    typedef void (*sqapi_tobool)(HSQUIRRELVM v, SQInteger idx, SQBool *b);
-    typedef SQRESULT (*sqapi_getstringandsize)(HSQUIRRELVM v,SQInteger idx,const SQChar **c,SQInteger *size);
-    typedef SQRESULT (*sqapi_getstring)(HSQUIRRELVM v,SQInteger idx,const SQChar **c);
-    typedef SQRESULT (*sqapi_getinteger)(HSQUIRRELVM v,SQInteger idx,SQInteger *i);
-    typedef SQRESULT (*sqapi_getfloat)(HSQUIRRELVM v,SQInteger idx,SQFloat *f);
-    typedef SQRESULT (*sqapi_getbool)(HSQUIRRELVM v,SQInteger idx,SQBool *b);
-    typedef SQRESULT (*sqapi_getthread)(HSQUIRRELVM v,SQInteger idx,HSQUIRRELVM *thread);
-    typedef SQRESULT (*sqapi_getuserpointer)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p);
-    typedef SQRESULT (*sqapi_getuserdata)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPointer *typetag);
-    typedef SQRESULT (*sqapi_settypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag);
-    typedef SQRESULT (*sqapi_gettypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
-    typedef void (*sqapi_setreleasehook)(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
-    typedef SQRELEASEHOOK (*sqapi_getreleasehook)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQChar* (*sqapi_getscratchpad)(HSQUIRRELVM v,SQInteger minsize);
-    typedef SQRESULT (*sqapi_getfunctioninfo)(HSQUIRRELVM v,SQInteger level,SQFunctionInfo *fi);
-    typedef SQRESULT (*sqapi_getclosureinfo)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
-    typedef SQRESULT (*sqapi_getclosurename)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_setnativeclosurename)(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
-    typedef SQRESULT (*sqapi_setinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
-    typedef SQRESULT (*sqapi_getinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag);
-    typedef SQRESULT (*sqapi_setclassudsize)(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
-    typedef SQRESULT (*sqapi_newclass)(HSQUIRRELVM v,SQBool hasbase);
-    typedef SQRESULT (*sqapi_createinstance)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_setattributes)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_getattributes)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_getclass)(HSQUIRRELVM v,SQInteger idx);
-    typedef void (*sqapi_weakref)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_getdefaultdelegate)(HSQUIRRELVM v,SQObjectType t);
-    typedef SQRESULT (*sqapi_getmemberhandle)(HSQUIRRELVM v,SQInteger idx,HSQMEMBERHANDLE *handle);
-    typedef SQRESULT (*sqapi_getbyhandle)(HSQUIRRELVM v,SQInteger idx,const HSQMEMBERHANDLE *handle);
-    typedef SQRESULT (*sqapi_setbyhandle)(HSQUIRRELVM v,SQInteger idx,const HSQMEMBERHANDLE *handle);
+    typedef SQUserPointer (*SqLibAPI_newuserdata)(HSQUIRRELVM v,SQUnsignedInteger size);
+    typedef void (*SqLibAPI_newtable)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_newtableex)(HSQUIRRELVM v,SQInteger initialcapacity);
+    typedef void (*SqLibAPI_newarray)(HSQUIRRELVM v,SQInteger size);
+    typedef void (*SqLibAPI_newclosure)(HSQUIRRELVM v,SQFUNCTION func,SQUnsignedInteger nfreevars);
+    typedef SQRESULT (*SqLibAPI_setparamscheck)(HSQUIRRELVM v,SQInteger nparamscheck,const SQChar *typemask);
+    typedef SQRESULT (*SqLibAPI_bindenv)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_setclosureroot)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getclosureroot)(HSQUIRRELVM v,SQInteger idx);
+    typedef void (*SqLibAPI_pushstring)(HSQUIRRELVM v,const SQChar *s,SQInteger len);
+    typedef void (*SqLibAPI_pushfloat)(HSQUIRRELVM v,SQFloat f);
+    typedef void (*SqLibAPI_pushinteger)(HSQUIRRELVM v,SQInteger n);
+    typedef void (*SqLibAPI_pushbool)(HSQUIRRELVM v,SQBool b);
+    typedef void (*SqLibAPI_pushuserpointer)(HSQUIRRELVM v,SQUserPointer p);
+    typedef void (*SqLibAPI_pushnull)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_pushthread)(HSQUIRRELVM v, HSQUIRRELVM thread);
+    typedef SQObjectType (*SqLibAPI_gettype)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_typeof)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQInteger (*SqLibAPI_getsize)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQHash (*SqLibAPI_gethash)(HSQUIRRELVM v, SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getbase)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQBool (*SqLibAPI_instanceof)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_tostring)(HSQUIRRELVM v,SQInteger idx);
+    typedef void (*SqLibAPI_tobool)(HSQUIRRELVM v, SQInteger idx, SQBool *b);
+    typedef SQRESULT (*SqLibAPI_getstringandsize)(HSQUIRRELVM v,SQInteger idx,const SQChar **c,SQInteger *size);
+    typedef SQRESULT (*SqLibAPI_getstring)(HSQUIRRELVM v,SQInteger idx,const SQChar **c);
+    typedef SQRESULT (*SqLibAPI_getinteger)(HSQUIRRELVM v,SQInteger idx,SQInteger *i);
+    typedef SQRESULT (*SqLibAPI_getfloat)(HSQUIRRELVM v,SQInteger idx,SQFloat *f);
+    typedef SQRESULT (*SqLibAPI_getbool)(HSQUIRRELVM v,SQInteger idx,SQBool *b);
+    typedef SQRESULT (*SqLibAPI_getthread)(HSQUIRRELVM v,SQInteger idx,HSQUIRRELVM *thread);
+    typedef SQRESULT (*SqLibAPI_getuserpointer)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p);
+    typedef SQRESULT (*SqLibAPI_getuserdata)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *p,SQUserPointer *typetag);
+    typedef SQRESULT (*SqLibAPI_settypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer typetag);
+    typedef SQRESULT (*SqLibAPI_gettypetag)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag);
+    typedef void (*SqLibAPI_setreleasehook)(HSQUIRRELVM v,SQInteger idx,SQRELEASEHOOK hook);
+    typedef SQRELEASEHOOK (*SqLibAPI_getreleasehook)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQChar* (*SqLibAPI_getscratchpad)(HSQUIRRELVM v,SQInteger minsize);
+    typedef SQRESULT (*SqLibAPI_getfunctioninfo)(HSQUIRRELVM v,SQInteger level,SQFunctionInfo *fi);
+    typedef SQRESULT (*SqLibAPI_getclosureinfo)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger *nparams,SQUnsignedInteger *nfreevars);
+    typedef SQRESULT (*SqLibAPI_getclosurename)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_setnativeclosurename)(HSQUIRRELVM v,SQInteger idx,const SQChar *name);
+    typedef SQRESULT (*SqLibAPI_setinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer p);
+    typedef SQRESULT (*SqLibAPI_getinstanceup)(HSQUIRRELVM v, SQInteger idx, SQUserPointer *p,SQUserPointer typetag);
+    typedef SQRESULT (*SqLibAPI_setclassudsize)(HSQUIRRELVM v, SQInteger idx, SQInteger udsize);
+    typedef SQRESULT (*SqLibAPI_newclass)(HSQUIRRELVM v,SQBool hasbase);
+    typedef SQRESULT (*SqLibAPI_createinstance)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_setattributes)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getattributes)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getclass)(HSQUIRRELVM v,SQInteger idx);
+    typedef void (*SqLibAPI_weakref)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getdefaultdelegate)(HSQUIRRELVM v,SQObjectType t);
+    typedef SQRESULT (*SqLibAPI_getmemberhandle)(HSQUIRRELVM v,SQInteger idx,HSQMEMBERHANDLE *handle);
+    typedef SQRESULT (*SqLibAPI_getbyhandle)(HSQUIRRELVM v,SQInteger idx,const HSQMEMBERHANDLE *handle);
+    typedef SQRESULT (*SqLibAPI_setbyhandle)(HSQUIRRELVM v,SQInteger idx,const HSQMEMBERHANDLE *handle);
 
     //object manipulation
-    typedef void (*sqapi_pushroottable)(HSQUIRRELVM v);
-    typedef void (*sqapi_pushregistrytable)(HSQUIRRELVM v);
-    typedef void (*sqapi_pushconsttable)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_setroottable)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_setconsttable)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_newslot)(HSQUIRRELVM v, SQInteger idx, SQBool bstatic);
-    typedef SQRESULT (*sqapi_deleteslot)(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
-    typedef SQRESULT (*sqapi_set)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_get)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_rawget)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_rawset)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_rawdeleteslot)(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
-    typedef SQRESULT (*sqapi_newmember)(HSQUIRRELVM v,SQInteger idx,SQBool bstatic);
-    typedef SQRESULT (*sqapi_rawnewmember)(HSQUIRRELVM v,SQInteger idx,SQBool bstatic);
-    typedef SQRESULT (*sqapi_arrayappend)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_arraypop)(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
-    typedef SQRESULT (*sqapi_arrayresize)(HSQUIRRELVM v,SQInteger idx,SQInteger newsize);
-    typedef SQRESULT (*sqapi_arrayreverse)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_arrayremove)(HSQUIRRELVM v,SQInteger idx,SQInteger itemidx);
-    typedef SQRESULT (*sqapi_arrayinsert)(HSQUIRRELVM v,SQInteger idx,SQInteger destpos);
-    typedef SQRESULT (*sqapi_setdelegate)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_getdelegate)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_clone)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_setfreevariable)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
-    typedef SQRESULT (*sqapi_next)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_getweakrefval)(HSQUIRRELVM v,SQInteger idx);
-    typedef SQRESULT (*sqapi_clear)(HSQUIRRELVM v,SQInteger idx);
+    typedef void (*SqLibAPI_pushroottable)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_pushregistrytable)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_pushconsttable)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_setroottable)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_setconsttable)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_newslot)(HSQUIRRELVM v, SQInteger idx, SQBool bstatic);
+    typedef SQRESULT (*SqLibAPI_deleteslot)(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
+    typedef SQRESULT (*SqLibAPI_set)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_get)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_rawget)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_rawset)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_rawdeleteslot)(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
+    typedef SQRESULT (*SqLibAPI_newmember)(HSQUIRRELVM v,SQInteger idx,SQBool bstatic);
+    typedef SQRESULT (*SqLibAPI_rawnewmember)(HSQUIRRELVM v,SQInteger idx,SQBool bstatic);
+    typedef SQRESULT (*SqLibAPI_arrayappend)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_arraypop)(HSQUIRRELVM v,SQInteger idx,SQBool pushval);
+    typedef SQRESULT (*SqLibAPI_arrayresize)(HSQUIRRELVM v,SQInteger idx,SQInteger newsize);
+    typedef SQRESULT (*SqLibAPI_arrayreverse)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_arrayremove)(HSQUIRRELVM v,SQInteger idx,SQInteger itemidx);
+    typedef SQRESULT (*SqLibAPI_arrayinsert)(HSQUIRRELVM v,SQInteger idx,SQInteger destpos);
+    typedef SQRESULT (*SqLibAPI_setdelegate)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getdelegate)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_clone)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_setfreevariable)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
+    typedef SQRESULT (*SqLibAPI_next)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_getweakrefval)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQRESULT (*SqLibAPI_clear)(HSQUIRRELVM v,SQInteger idx);
 
     //calls
-    typedef SQRESULT (*sqapi_call)(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror);
-    typedef SQRESULT (*sqapi_resume)(HSQUIRRELVM v,SQBool retval,SQBool raiseerror);
-    typedef const SQChar* (*sqapi_getlocal)(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
-    typedef SQRESULT (*sqapi_getcallee)(HSQUIRRELVM v);
-    typedef const SQChar* (*sqapi_getfreevariable)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
-    typedef SQRESULT (*sqapi_throwerror)(HSQUIRRELVM v,const SQChar *err);
-    typedef SQRESULT (*sqapi_throwobject)(HSQUIRRELVM v);
-    typedef void (*sqapi_reseterror)(HSQUIRRELVM v);
-    typedef void (*sqapi_getlasterror)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_call)(HSQUIRRELVM v,SQInteger params,SQBool retval,SQBool raiseerror);
+    typedef SQRESULT (*SqLibAPI_resume)(HSQUIRRELVM v,SQBool retval,SQBool raiseerror);
+    typedef const SQChar* (*SqLibAPI_getlocal)(HSQUIRRELVM v,SQUnsignedInteger level,SQUnsignedInteger idx);
+    typedef SQRESULT (*SqLibAPI_getcallee)(HSQUIRRELVM v);
+    typedef const SQChar* (*SqLibAPI_getfreevariable)(HSQUIRRELVM v,SQInteger idx,SQUnsignedInteger nval);
+    typedef SQRESULT (*SqLibAPI_throwerror)(HSQUIRRELVM v,const SQChar *err);
+    typedef SQRESULT (*SqLibAPI_throwobject)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_reseterror)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_getlasterror)(HSQUIRRELVM v);
 
     //raw object handling
-    typedef SQRESULT (*sqapi_getstackobj)(HSQUIRRELVM v,SQInteger idx,HSQOBJECT *po);
-    typedef void (*sqapi_pushobject)(HSQUIRRELVM v,HSQOBJECT obj);
-    typedef void (*sqapi_addref)(HSQUIRRELVM v,HSQOBJECT *po);
-    typedef SQBool (*sqapi_release)(HSQUIRRELVM v,HSQOBJECT *po);
-    typedef SQUnsignedInteger (*sqapi_getrefcount)(HSQUIRRELVM v,HSQOBJECT *po);
-    typedef void (*sqapi_resetobject)(HSQOBJECT *po);
-    typedef const SQChar* (*sqapi_objtostring)(const HSQOBJECT *o);
-    typedef SQBool (*sqapi_objtobool)(const HSQOBJECT *o);
-    typedef SQInteger (*sqapi_objtointeger)(const HSQOBJECT *o);
-    typedef SQFloat (*sqapi_objtofloat)(const HSQOBJECT *o);
-    typedef SQUserPointer (*sqapi_objtouserpointer)(const HSQOBJECT *o);
-    typedef SQRESULT (*sqapi_getobjtypetag)(const HSQOBJECT *o,SQUserPointer * typetag);
-    typedef SQUnsignedInteger (*sqapi_getvmrefcount)(HSQUIRRELVM v, const HSQOBJECT *po);
+    typedef SQRESULT (*SqLibAPI_getstackobj)(HSQUIRRELVM v,SQInteger idx,HSQOBJECT *po);
+    typedef void (*SqLibAPI_pushobject)(HSQUIRRELVM v,HSQOBJECT obj);
+    typedef void (*SqLibAPI_addref)(HSQUIRRELVM v,HSQOBJECT *po);
+    typedef SQBool (*SqLibAPI_release)(HSQUIRRELVM v,HSQOBJECT *po);
+    typedef SQUnsignedInteger (*SqLibAPI_getrefcount)(HSQUIRRELVM v,HSQOBJECT *po);
+    typedef void (*SqLibAPI_resetobject)(HSQOBJECT *po);
+    typedef const SQChar* (*SqLibAPI_objtostring)(const HSQOBJECT *o);
+    typedef SQBool (*SqLibAPI_objtobool)(const HSQOBJECT *o);
+    typedef SQInteger (*SqLibAPI_objtointeger)(const HSQOBJECT *o);
+    typedef SQFloat (*SqLibAPI_objtofloat)(const HSQOBJECT *o);
+    typedef SQUserPointer (*SqLibAPI_objtouserpointer)(const HSQOBJECT *o);
+    typedef SQRESULT (*SqLibAPI_getobjtypetag)(const HSQOBJECT *o,SQUserPointer * typetag);
+    typedef SQUnsignedInteger (*SqLibAPI_getvmrefcount)(HSQUIRRELVM v, const HSQOBJECT *po);
 
 
     //GC
-    typedef SQInteger (*sqapi_collectgarbage)(HSQUIRRELVM v);
-    typedef SQRESULT (*sqapi_resurrectunreachable)(HSQUIRRELVM v);
+    typedef SQInteger (*SqLibAPI_collectgarbage)(HSQUIRRELVM v);
+    typedef SQRESULT (*SqLibAPI_resurrectunreachable)(HSQUIRRELVM v);
 
     //serialization
-    typedef SQRESULT (*sqapi_writeclosure)(HSQUIRRELVM vm,SQWRITEFUNC writef,SQUserPointer up);
-    typedef SQRESULT (*sqapi_readclosure)(HSQUIRRELVM vm,SQREADFUNC readf,SQUserPointer up);
+    typedef SQRESULT (*SqLibAPI_writeclosure)(HSQUIRRELVM vm,SQWRITEFUNC writef,SQUserPointer up);
+    typedef SQRESULT (*SqLibAPI_readclosure)(HSQUIRRELVM vm,SQREADFUNC readf,SQUserPointer up);
 
     //mem allocation
-    typedef void* (*sqapi_malloc)(SQUnsignedInteger size);
-    typedef void* (*sqapi_realloc)(void* p,SQUnsignedInteger oldsize,SQUnsignedInteger newsize);
-    typedef void (*sqapi_free)(void *p,SQUnsignedInteger size);
+    typedef void* (*SqLibAPI_malloc)(SQUnsignedInteger size);
+    typedef void* (*SqLibAPI_realloc)(void* p,SQUnsignedInteger oldsize,SQUnsignedInteger newsize);
+    typedef void (*SqLibAPI_free)(void *p,SQUnsignedInteger size);
 
     //debug
-    typedef SQRESULT (*sqapi_stackinfos)(HSQUIRRELVM v,SQInteger level,SQStackInfos *si);
-    typedef void (*sqapi_setdebughook)(HSQUIRRELVM v);
-    typedef void (*sqapi_setnativedebughook)(HSQUIRRELVM v,SQDEBUGHOOK hook);
+    typedef SQRESULT (*SqLibAPI_stackinfos)(HSQUIRRELVM v,SQInteger level,SQStackInfos *si);
+    typedef void (*SqLibAPI_setdebughook)(HSQUIRRELVM v);
+    typedef void (*SqLibAPI_setnativedebughook)(HSQUIRRELVM v,SQDEBUGHOOK hook);
 
     //compiler helpers
-    typedef SQRESULT (*sqapi_loadfile)(HSQUIRRELVM v,const SQChar *filename,SQBool printerror);
-    typedef SQRESULT (*sqapi_dofile)(HSQUIRRELVM v,const SQChar *filename,SQBool retval,SQBool printerror);
-    typedef SQRESULT (*sqapi_writeclosuretofile)(HSQUIRRELVM v,const SQChar *filename);
+    typedef SQRESULT (*SqLibAPI_loadfile)(HSQUIRRELVM v,const SQChar *filename,SQBool printerror);
+    typedef SQRESULT (*SqLibAPI_dofile)(HSQUIRRELVM v,const SQChar *filename,SQBool retval,SQBool printerror);
+    typedef SQRESULT (*SqLibAPI_writeclosuretofile)(HSQUIRRELVM v,const SQChar *filename);
 
     //blob
-    typedef SQUserPointer (*sqapi_createblob)(HSQUIRRELVM v, SQInteger size);
-    typedef SQRESULT (*sqapi_getblob)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *ptr);
-    typedef SQInteger (*sqapi_getblobsize)(HSQUIRRELVM v,SQInteger idx);
+    typedef SQUserPointer (*SqLibAPI_createblob)(HSQUIRRELVM v, SQInteger size);
+    typedef SQRESULT (*SqLibAPI_getblob)(HSQUIRRELVM v,SQInteger idx,SQUserPointer *ptr);
+    typedef SQInteger (*SqLibAPI_getblobsize)(HSQUIRRELVM v,SQInteger idx);
 
     //string
-    typedef SQRESULT (*sqapi_format)(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen,SQChar **output);
+    typedef SQRESULT (*SqLibAPI_format)(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen,SQChar **output);
 
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     /// @cond DEV
     /// Allows modules to interface with Squirrel's C api without linking to the squirrel library.
     /// If new functions are added to the Squirrel API, they should be added here too.
     /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    typedef struct {
+    typedef struct
+    {
         //vm
-        sqapi_open                          open;
-        sqapi_newthread                     newthread;
-        sqapi_seterrorhandler               seterrorhandler;
-        sqapi_close                         close;
-        sqapi_setforeignptr                 setforeignptr;
-        sqapi_getforeignptr                 getforeignptr;
-        sqapi_setsharedforeignptr           setsharedforeignptr;
-        sqapi_getsharedforeignptr           getsharedforeignptr;
-        sqapi_setvmreleasehook              setvmreleasehook;
-        sqapi_getvmreleasehook              getvmreleasehook;
-        sqapi_setsharedreleasehook          setsharedreleasehook;
-        sqapi_getsharedreleasehook          getsharedreleasehook;
-        sqapi_setprintfunc                  setprintfunc;
-        sqapi_getprintfunc                  getprintfunc;
-        sqapi_geterrorfunc                  geterrorfunc;
-        sqapi_suspendvm                     suspendvm;
-        sqapi_wakeupvm                      wakeupvm;
-        sqapi_getvmstate                    getvmstate;
-        sqapi_getversion                    getversion;
+        SqLibAPI_open                               open;
+        SqLibAPI_newthread                          newthread;
+        SqLibAPI_seterrorhandler                    seterrorhandler;
+        SqLibAPI_close                              close;
+        SqLibAPI_setforeignptr                      setforeignptr;
+        SqLibAPI_getforeignptr                      getforeignptr;
+        SqLibAPI_setsharedforeignptr                setsharedforeignptr;
+        SqLibAPI_getsharedforeignptr                getsharedforeignptr;
+        SqLibAPI_setvmreleasehook                   setvmreleasehook;
+        SqLibAPI_getvmreleasehook                   getvmreleasehook;
+        SqLibAPI_setsharedreleasehook               setsharedreleasehook;
+        SqLibAPI_getsharedreleasehook               getsharedreleasehook;
+        SqLibAPI_setprintfunc                       setprintfunc;
+        SqLibAPI_getprintfunc                       getprintfunc;
+        SqLibAPI_geterrorfunc                       geterrorfunc;
+        SqLibAPI_suspendvm                          suspendvm;
+        SqLibAPI_wakeupvm                           wakeupvm;
+        SqLibAPI_getvmstate                         getvmstate;
+        SqLibAPI_getversion                         getversion;
 
         //compiler
-        sqapi_compile                       compile;
-        sqapi_compilebuffer                 compilebuffer;
-        sqapi_enabledebuginfo               enabledebuginfo;
-        sqapi_notifyallexceptions           notifyallexceptions;
-        sqapi_setcompilererrorhandler       setcompilererrorhandler;
+        SqLibAPI_compile                            compile;
+        SqLibAPI_compilebuffer                      compilebuffer;
+        SqLibAPI_enabledebuginfo                    enabledebuginfo;
+        SqLibAPI_notifyallexceptions                notifyallexceptions;
+        SqLibAPI_setcompilererrorhandler            setcompilererrorhandler;
 
         //stack operations
-        sqapi_push                          push;
-        sqapi_pop                           pop;
-        sqapi_poptop                        poptop;
-        sqapi_remove                        remove;
-        sqapi_gettop                        gettop;
-        sqapi_settop                        settop;
-        sqapi_reservestack                  reservestack;
-        sqapi_cmp                           cmp;
-        sqapi_move                          move;
+        SqLibAPI_push                               push;
+        SqLibAPI_pop                                pop;
+        SqLibAPI_poptop                             poptop;
+        SqLibAPI_remove                             remove;
+        SqLibAPI_gettop                             gettop;
+        SqLibAPI_settop                             settop;
+        SqLibAPI_reservestack                       reservestack;
+        SqLibAPI_cmp                                cmp;
+        SqLibAPI_move                               move;
 
         //object creation handling
-        sqapi_newuserdata                   newuserdata;
-        sqapi_newtable                      newtable;
-        sqapi_newtableex                    newtableex;
-        sqapi_newarray                      newarray;
-        sqapi_newclosure                    newclosure;
-        sqapi_setparamscheck                setparamscheck;
-        sqapi_bindenv                       bindenv;
-        sqapi_setclosureroot                setclosureroot;
-        sqapi_getclosureroot                getclosureroot;
-        sqapi_pushstring                    pushstring;
-        sqapi_pushfloat                     pushfloat;
-        sqapi_pushinteger                   pushinteger;
-        sqapi_pushbool                      pushbool;
-        sqapi_pushuserpointer               pushuserpointer;
-        sqapi_pushnull                      pushnull;
-        sqapi_pushthread                    pushthread;
-        sqapi_gettype                       gettype;
-        sqapi_typeof                        typeof_;
-        sqapi_getsize                       getsize;
-        sqapi_gethash                       gethash;
-        sqapi_getbase                       getbase;
-        sqapi_instanceof                    instanceof;
-        sqapi_tostring                      tostring;
-        sqapi_tobool                        tobool;
-        sqapi_getstringandsize              getstringandsize;
-        sqapi_getstring                     getstring;
-        sqapi_getinteger                    getinteger;
-        sqapi_getfloat                      getfloat;
-        sqapi_getbool                       getbool;
-        sqapi_getthread                     getthread;
-        sqapi_getuserpointer                getuserpointer;
-        sqapi_getuserdata                   getuserdata;
-        sqapi_settypetag                    settypetag;
-        sqapi_gettypetag                    gettypetag;
-        sqapi_setreleasehook                setreleasehook;
-        sqapi_getreleasehook                getreleasehook;
-        sqapi_getscratchpad                 getscratchpad;
-        sqapi_getfunctioninfo               getfunctioninfo;
-        sqapi_getclosureinfo                getclosureinfo;
-        sqapi_getclosurename                getclosurename;
-        sqapi_setnativeclosurename          setnativeclosurename;
-        sqapi_setinstanceup                 setinstanceup;
-        sqapi_getinstanceup                 getinstanceup;
-        sqapi_setclassudsize                setclassudsize;
-        sqapi_newclass                      newclass;
-        sqapi_createinstance                createinstance;
-        sqapi_setattributes                 setattributes;
-        sqapi_getattributes                 getattributes;
-        sqapi_getclass                      getclass;
-        sqapi_weakref                       weakref;
-        sqapi_getdefaultdelegate            getdefaultdelegate;
-        sqapi_getmemberhandle               getmemberhandle;
-        sqapi_getbyhandle                   getbyhandle;
-        sqapi_setbyhandle                   setbyhandle;
+        SqLibAPI_newuserdata                        newuserdata;
+        SqLibAPI_newtable                           newtable;
+        SqLibAPI_newtableex                         newtableex;
+        SqLibAPI_newarray                           newarray;
+        SqLibAPI_newclosure                         newclosure;
+        SqLibAPI_setparamscheck                     setparamscheck;
+        SqLibAPI_bindenv                            bindenv;
+        SqLibAPI_setclosureroot                     setclosureroot;
+        SqLibAPI_getclosureroot                     getclosureroot;
+        SqLibAPI_pushstring                         pushstring;
+        SqLibAPI_pushfloat                          pushfloat;
+        SqLibAPI_pushinteger                        pushinteger;
+        SqLibAPI_pushbool                           pushbool;
+        SqLibAPI_pushuserpointer                    pushuserpointer;
+        SqLibAPI_pushnull                           pushnull;
+        SqLibAPI_pushthread                         pushthread;
+        SqLibAPI_gettype                            gettype;
+        SqLibAPI_typeof                             typeof_;
+        SqLibAPI_getsize                            getsize;
+        SqLibAPI_gethash                            gethash;
+        SqLibAPI_getbase                            getbase;
+        SqLibAPI_instanceof                         instanceof;
+        SqLibAPI_tostring                           tostring;
+        SqLibAPI_tobool                             tobool;
+        SqLibAPI_getstringandsize                   getstringandsize;
+        SqLibAPI_getstring                          getstring;
+        SqLibAPI_getinteger                         getinteger;
+        SqLibAPI_getfloat                           getfloat;
+        SqLibAPI_getbool                            getbool;
+        SqLibAPI_getthread                          getthread;
+        SqLibAPI_getuserpointer                     getuserpointer;
+        SqLibAPI_getuserdata                        getuserdata;
+        SqLibAPI_settypetag                         settypetag;
+        SqLibAPI_gettypetag                         gettypetag;
+        SqLibAPI_setreleasehook                     setreleasehook;
+        SqLibAPI_getreleasehook                     getreleasehook;
+        SqLibAPI_getscratchpad                      getscratchpad;
+        SqLibAPI_getfunctioninfo                    getfunctioninfo;
+        SqLibAPI_getclosureinfo                     getclosureinfo;
+        SqLibAPI_getclosurename                     getclosurename;
+        SqLibAPI_setnativeclosurename               setnativeclosurename;
+        SqLibAPI_setinstanceup                      setinstanceup;
+        SqLibAPI_getinstanceup                      getinstanceup;
+        SqLibAPI_setclassudsize                     setclassudsize;
+        SqLibAPI_newclass                           newclass;
+        SqLibAPI_createinstance                     createinstance;
+        SqLibAPI_setattributes                      setattributes;
+        SqLibAPI_getattributes                      getattributes;
+        SqLibAPI_getclass                           getclass;
+        SqLibAPI_weakref                            weakref;
+        SqLibAPI_getdefaultdelegate                 getdefaultdelegate;
+        SqLibAPI_getmemberhandle                    getmemberhandle;
+        SqLibAPI_getbyhandle                        getbyhandle;
+        SqLibAPI_setbyhandle                        setbyhandle;
 
         //object manipulation
-        sqapi_pushroottable                 pushroottable;
-        sqapi_pushregistrytable             pushregistrytable;
-        sqapi_pushconsttable                pushconsttable;
-        sqapi_setroottable                  setroottable;
-        sqapi_setconsttable                 setconsttable;
-        sqapi_newslot                       newslot;
-        sqapi_deleteslot                    deleteslot;
-        sqapi_set                           set;
-        sqapi_get                           get;
-        sqapi_rawget                        rawget;
-        sqapi_rawset                        rawset;
-        sqapi_rawdeleteslot                 rawdeleteslot;
-        sqapi_newmember                     newmember;
-        sqapi_rawnewmember                  rawnewmember;
-        sqapi_arrayappend                   arrayappend;
-        sqapi_arraypop                      arraypop;
-        sqapi_arrayresize                   arrayresize;
-        sqapi_arrayreverse                  arrayreverse;
-        sqapi_arrayremove                   arrayremove;
-        sqapi_arrayinsert                   arrayinsert;
-        sqapi_setdelegate                   setdelegate;
-        sqapi_getdelegate                   getdelegate;
-        sqapi_clone                         clone;
-        sqapi_setfreevariable               setfreevariable;
-        sqapi_next                          next;
-        sqapi_getweakrefval                 getweakrefval;
-        sqapi_clear                         clear;
+        SqLibAPI_pushroottable                      pushroottable;
+        SqLibAPI_pushregistrytable                  pushregistrytable;
+        SqLibAPI_pushconsttable                     pushconsttable;
+        SqLibAPI_setroottable                       setroottable;
+        SqLibAPI_setconsttable                      setconsttable;
+        SqLibAPI_newslot                            newslot;
+        SqLibAPI_deleteslot                         deleteslot;
+        SqLibAPI_set                                set;
+        SqLibAPI_get                                get;
+        SqLibAPI_rawget                             rawget;
+        SqLibAPI_rawset                             rawset;
+        SqLibAPI_rawdeleteslot                      rawdeleteslot;
+        SqLibAPI_newmember                          newmember;
+        SqLibAPI_rawnewmember                       rawnewmember;
+        SqLibAPI_arrayappend                        arrayappend;
+        SqLibAPI_arraypop                           arraypop;
+        SqLibAPI_arrayresize                        arrayresize;
+        SqLibAPI_arrayreverse                       arrayreverse;
+        SqLibAPI_arrayremove                        arrayremove;
+        SqLibAPI_arrayinsert                        arrayinsert;
+        SqLibAPI_setdelegate                        setdelegate;
+        SqLibAPI_getdelegate                        getdelegate;
+        SqLibAPI_clone                              clone;
+        SqLibAPI_setfreevariable                    setfreevariable;
+        SqLibAPI_next                               next;
+        SqLibAPI_getweakrefval                      getweakrefval;
+        SqLibAPI_clear                              clear;
 
         //calls
-        sqapi_call                          call;
-        sqapi_resume                        resume;
-        sqapi_getlocal                      getlocal;
-        sqapi_getcallee                     getcallee;
-        sqapi_getfreevariable               getfreevariable;
-        sqapi_throwerror                    throwerror;
-        sqapi_throwobject                   throwobject;
-        sqapi_reseterror                    reseterror;
-        sqapi_getlasterror                  getlasterror;
+        SqLibAPI_call                               call;
+        SqLibAPI_resume                             resume;
+        SqLibAPI_getlocal                           getlocal;
+        SqLibAPI_getcallee                          getcallee;
+        SqLibAPI_getfreevariable                    getfreevariable;
+        SqLibAPI_throwerror                         throwerror;
+        SqLibAPI_throwobject                        throwobject;
+        SqLibAPI_reseterror                         reseterror;
+        SqLibAPI_getlasterror                       getlasterror;
 
         //raw object handling
-        sqapi_getstackobj                   getstackobj;
-        sqapi_pushobject                    pushobject;
-        sqapi_addref                        addref;
-        sqapi_release                       release;
-        sqapi_getrefcount                   getrefcount;
-        sqapi_resetobject                   resetobject;
-        sqapi_objtostring                   objtostring;
-        sqapi_objtobool                     objtobool;
-        sqapi_objtointeger                  objtointeger;
-        sqapi_objtofloat                    objtofloat;
-        sqapi_objtouserpointer              objtouserpointer;
-        sqapi_getobjtypetag                 getobjtypetag;
-        sqapi_getvmrefcount                 getvmrefcount;
+        SqLibAPI_getstackobj                        getstackobj;
+        SqLibAPI_pushobject                         pushobject;
+        SqLibAPI_addref                             addref;
+        SqLibAPI_release                            release;
+        SqLibAPI_getrefcount                        getrefcount;
+        SqLibAPI_resetobject                        resetobject;
+        SqLibAPI_objtostring                        objtostring;
+        SqLibAPI_objtobool                          objtobool;
+        SqLibAPI_objtointeger                       objtointeger;
+        SqLibAPI_objtofloat                         objtofloat;
+        SqLibAPI_objtouserpointer                   objtouserpointer;
+        SqLibAPI_getobjtypetag                      getobjtypetag;
+        SqLibAPI_getvmrefcount                      getvmrefcount;
 
         //GC
-        sqapi_collectgarbage                collectgarbage;
-        sqapi_resurrectunreachable          resurrectunreachable;
+        SqLibAPI_collectgarbage                     collectgarbage;
+        SqLibAPI_resurrectunreachable               resurrectunreachable;
 
         //serialization
-        sqapi_writeclosure                  writeclosure;
-        sqapi_readclosure                   readclosure;
+        SqLibAPI_writeclosure                       writeclosure;
+        SqLibAPI_readclosure                        readclosure;
 
         //mem allocation
-        sqapi_malloc                        malloc;
-        sqapi_realloc                       realloc;
-        sqapi_free                          free;
+        SqLibAPI_malloc                             malloc;
+        SqLibAPI_realloc                            realloc;
+        SqLibAPI_free                               free;
 
         //debug
-        sqapi_stackinfos                    stackinfos;
-        sqapi_setdebughook                  setdebughook;
-        sqapi_setnativedebughook            setnativedebughook;
+        SqLibAPI_stackinfos                         stackinfos;
+        SqLibAPI_setdebughook                       setdebughook;
+        SqLibAPI_setnativedebughook                 setnativedebughook;
 
         //compiler helpers
-        sqapi_loadfile                      loadfile;
-        sqapi_dofile                        dofile;
-        sqapi_writeclosuretofile            writeclosuretofile;
+        SqLibAPI_loadfile                           loadfile;
+        SqLibAPI_dofile                             dofile;
+        SqLibAPI_writeclosuretofile                 writeclosuretofile;
 
         //blob
-        sqapi_createblob                    createblob;
-        sqapi_getblob                       getblob;
-        sqapi_getblobsize                   getblobsize;
+        SqLibAPI_createblob                         createblob;
+        SqLibAPI_getblob                            getblob;
+        SqLibAPI_getblobsize                        getblobsize;
 
         //string
-        sqapi_format                        format;
-    } sq_api, SQAPI, *HSQAPI;
+        SqLibAPI_format                             format;
+    } sqlib_api, SQLIBAPI, *HSQLIBAPI;
     /// @endcond
 
 #ifdef SQMOD_PLUGIN_API
 
     //vm
-    extern sqapi_open                           sq_open;
-    extern sqapi_newthread                      sq_newthread;
-    extern sqapi_seterrorhandler                sq_seterrorhandler;
-    extern sqapi_close                          sq_close;
-    extern sqapi_setforeignptr                  sq_setforeignptr;
-    extern sqapi_getforeignptr                  sq_getforeignptr;
-    extern sqapi_setsharedforeignptr            sq_setsharedforeignptr;
-    extern sqapi_getsharedforeignptr            sq_getsharedforeignptr;
-    extern sqapi_setvmreleasehook               sq_setvmreleasehook;
-    extern sqapi_getvmreleasehook               sq_getvmreleasehook;
-    extern sqapi_setsharedreleasehook           sq_setsharedreleasehook;
-    extern sqapi_getsharedreleasehook           sq_getsharedreleasehook;
-    extern sqapi_setprintfunc                   sq_setprintfunc;
-    extern sqapi_getprintfunc                   sq_getprintfunc;
-    extern sqapi_geterrorfunc                   sq_geterrorfunc;
-    extern sqapi_suspendvm                      sq_suspendvm;
-    extern sqapi_wakeupvm                       sq_wakeupvm;
-    extern sqapi_getvmstate                     sq_getvmstate;
-    extern sqapi_getversion                     sq_getversion;
+    extern SqLibAPI_open                            SqLib_open;
+    extern SqLibAPI_newthread                       SqLib_newthread;
+    extern SqLibAPI_seterrorhandler                 SqLib_seterrorhandler;
+    extern SqLibAPI_close                           SqLib_close;
+    extern SqLibAPI_setforeignptr                   SqLib_setforeignptr;
+    extern SqLibAPI_getforeignptr                   SqLib_getforeignptr;
+    extern SqLibAPI_setsharedforeignptr             SqLib_setsharedforeignptr;
+    extern SqLibAPI_getsharedforeignptr             SqLib_getsharedforeignptr;
+    extern SqLibAPI_setvmreleasehook                SqLib_setvmreleasehook;
+    extern SqLibAPI_getvmreleasehook                SqLib_getvmreleasehook;
+    extern SqLibAPI_setsharedreleasehook            SqLib_setsharedreleasehook;
+    extern SqLibAPI_getsharedreleasehook            SqLib_getsharedreleasehook;
+    extern SqLibAPI_setprintfunc                    SqLib_setprintfunc;
+    extern SqLibAPI_getprintfunc                    SqLib_getprintfunc;
+    extern SqLibAPI_geterrorfunc                    SqLib_geterrorfunc;
+    extern SqLibAPI_suspendvm                       SqLib_suspendvm;
+    extern SqLibAPI_wakeupvm                        SqLib_wakeupvm;
+    extern SqLibAPI_getvmstate                      SqLib_getvmstate;
+    extern SqLibAPI_getversion                      SqLib_getversion;
 
     //compiler
-    extern sqapi_compile                        sq_compile;
-    extern sqapi_compilebuffer                  sq_compilebuffer;
-    extern sqapi_enabledebuginfo                sq_enabledebuginfo;
-    extern sqapi_notifyallexceptions            sq_notifyallexceptions;
-    extern sqapi_setcompilererrorhandler        sq_setcompilererrorhandler;
+    extern SqLibAPI_compile                         SqLib_compile;
+    extern SqLibAPI_compilebuffer                   SqLib_compilebuffer;
+    extern SqLibAPI_enabledebuginfo                 SqLib_enabledebuginfo;
+    extern SqLibAPI_notifyallexceptions             SqLib_notifyallexceptions;
+    extern SqLibAPI_setcompilererrorhandler         SqLib_setcompilererrorhandler;
 
     //stack operations
-    extern sqapi_push                           sq_push;
-    extern sqapi_pop                            sq_pop;
-    extern sqapi_poptop                         sq_poptop;
-    extern sqapi_remove                         sq_remove;
-    extern sqapi_gettop                         sq_gettop;
-    extern sqapi_settop                         sq_settop;
-    extern sqapi_reservestack                   sq_reservestack;
-    extern sqapi_cmp                            sq_cmp;
-    extern sqapi_move                           sq_move;
+    extern SqLibAPI_push                            SqLib_push;
+    extern SqLibAPI_pop                             SqLib_pop;
+    extern SqLibAPI_poptop                          SqLib_poptop;
+    extern SqLibAPI_remove                          SqLib_remove;
+    extern SqLibAPI_gettop                          SqLib_gettop;
+    extern SqLibAPI_settop                          SqLib_settop;
+    extern SqLibAPI_reservestack                    SqLib_reservestack;
+    extern SqLibAPI_cmp                             SqLib_cmp;
+    extern SqLibAPI_move                            SqLib_move;
 
     //object creation handling
-    extern sqapi_newuserdata                    sq_newuserdata;
-    extern sqapi_newtable                       sq_newtable;
-    extern sqapi_newtableex                     sq_newtableex;
-    extern sqapi_newarray                       sq_newarray;
-    extern sqapi_newclosure                     sq_newclosure;
-    extern sqapi_setparamscheck                 sq_setparamscheck;
-    extern sqapi_bindenv                        sq_bindenv;
-    extern sqapi_setclosureroot                 sq_setclosureroot;
-    extern sqapi_getclosureroot                 sq_getclosureroot;
-    extern sqapi_pushstring                     sq_pushstring;
-    extern sqapi_pushfloat                      sq_pushfloat;
-    extern sqapi_pushinteger                    sq_pushinteger;
-    extern sqapi_pushbool                       sq_pushbool;
-    extern sqapi_pushuserpointer                sq_pushuserpointer;
-    extern sqapi_pushnull                       sq_pushnull;
-    extern sqapi_pushthread                     sq_pushthread;
-    extern sqapi_gettype                        sq_gettype;
-    extern sqapi_typeof                         sq_typeof;
-    extern sqapi_getsize                        sq_getsize;
-    extern sqapi_gethash                        sq_gethash;
-    extern sqapi_getbase                        sq_getbase;
-    extern sqapi_instanceof                     sq_instanceof;
-    extern sqapi_tostring                       sq_tostring;
-    extern sqapi_tobool                         sq_tobool;
-    extern sqapi_getstringandsize               sq_getstringandsize;
-    extern sqapi_getstring                      sq_getstring;
-    extern sqapi_getinteger                     sq_getinteger;
-    extern sqapi_getfloat                       sq_getfloat;
-    extern sqapi_getbool                        sq_getbool;
-    extern sqapi_getthread                      sq_getthread;
-    extern sqapi_getuserpointer                 sq_getuserpointer;
-    extern sqapi_getuserdata                    sq_getuserdata;
-    extern sqapi_settypetag                     sq_settypetag;
-    extern sqapi_gettypetag                     sq_gettypetag;
-    extern sqapi_setreleasehook                 sq_setreleasehook;
-    extern sqapi_getreleasehook                 sq_getreleasehook;
-    extern sqapi_getscratchpad                  sq_getscratchpad;
-    extern sqapi_getfunctioninfo                sq_getfunctioninfo;
-    extern sqapi_getclosureinfo                 sq_getclosureinfo;
-    extern sqapi_getclosurename                 sq_getclosurename;
-    extern sqapi_setnativeclosurename           sq_setnativeclosurename;
-    extern sqapi_setinstanceup                  sq_setinstanceup;
-    extern sqapi_getinstanceup                  sq_getinstanceup;
-    extern sqapi_setclassudsize                 sq_setclassudsize;
-    extern sqapi_newclass                       sq_newclass;
-    extern sqapi_createinstance                 sq_createinstance;
-    extern sqapi_setattributes                  sq_setattributes;
-    extern sqapi_getattributes                  sq_getattributes;
-    extern sqapi_getclass                       sq_getclass;
-    extern sqapi_weakref                        sq_weakref;
-    extern sqapi_getdefaultdelegate             sq_getdefaultdelegate;
-    extern sqapi_getmemberhandle                sq_getmemberhandle;
-    extern sqapi_getbyhandle                    sq_getbyhandle;
-    extern sqapi_setbyhandle                    sq_setbyhandle;
+    extern SqLibAPI_newuserdata                     SqLib_newuserdata;
+    extern SqLibAPI_newtable                        SqLib_newtable;
+    extern SqLibAPI_newtableex                      SqLib_newtableex;
+    extern SqLibAPI_newarray                        SqLib_newarray;
+    extern SqLibAPI_newclosure                      SqLib_newclosure;
+    extern SqLibAPI_setparamscheck                  SqLib_setparamscheck;
+    extern SqLibAPI_bindenv                         SqLib_bindenv;
+    extern SqLibAPI_setclosureroot                  SqLib_setclosureroot;
+    extern SqLibAPI_getclosureroot                  SqLib_getclosureroot;
+    extern SqLibAPI_pushstring                      SqLib_pushstring;
+    extern SqLibAPI_pushfloat                       SqLib_pushfloat;
+    extern SqLibAPI_pushinteger                     SqLib_pushinteger;
+    extern SqLibAPI_pushbool                        SqLib_pushbool;
+    extern SqLibAPI_pushuserpointer                 SqLib_pushuserpointer;
+    extern SqLibAPI_pushnull                        SqLib_pushnull;
+    extern SqLibAPI_pushthread                      SqLib_pushthread;
+    extern SqLibAPI_gettype                         SqLib_gettype;
+    extern SqLibAPI_typeof                          SqLib_typeof;
+    extern SqLibAPI_getsize                         SqLib_getsize;
+    extern SqLibAPI_gethash                         SqLib_gethash;
+    extern SqLibAPI_getbase                         SqLib_getbase;
+    extern SqLibAPI_instanceof                      SqLib_instanceof;
+    extern SqLibAPI_tostring                        SqLib_tostring;
+    extern SqLibAPI_tobool                          SqLib_tobool;
+    extern SqLibAPI_getstringandsize                SqLib_getstringandsize;
+    extern SqLibAPI_getstring                       SqLib_getstring;
+    extern SqLibAPI_getinteger                      SqLib_getinteger;
+    extern SqLibAPI_getfloat                        SqLib_getfloat;
+    extern SqLibAPI_getbool                         SqLib_getbool;
+    extern SqLibAPI_getthread                       SqLib_getthread;
+    extern SqLibAPI_getuserpointer                  SqLib_getuserpointer;
+    extern SqLibAPI_getuserdata                     SqLib_getuserdata;
+    extern SqLibAPI_settypetag                      SqLib_settypetag;
+    extern SqLibAPI_gettypetag                      SqLib_gettypetag;
+    extern SqLibAPI_setreleasehook                  SqLib_setreleasehook;
+    extern SqLibAPI_getreleasehook                  SqLib_getreleasehook;
+    extern SqLibAPI_getscratchpad                   SqLib_getscratchpad;
+    extern SqLibAPI_getfunctioninfo                 SqLib_getfunctioninfo;
+    extern SqLibAPI_getclosureinfo                  SqLib_getclosureinfo;
+    extern SqLibAPI_getclosurename                  SqLib_getclosurename;
+    extern SqLibAPI_setnativeclosurename            SqLib_setnativeclosurename;
+    extern SqLibAPI_setinstanceup                   SqLib_setinstanceup;
+    extern SqLibAPI_getinstanceup                   SqLib_getinstanceup;
+    extern SqLibAPI_setclassudsize                  SqLib_setclassudsize;
+    extern SqLibAPI_newclass                        SqLib_newclass;
+    extern SqLibAPI_createinstance                  SqLib_createinstance;
+    extern SqLibAPI_setattributes                   SqLib_setattributes;
+    extern SqLibAPI_getattributes                   SqLib_getattributes;
+    extern SqLibAPI_getclass                        SqLib_getclass;
+    extern SqLibAPI_weakref                         SqLib_weakref;
+    extern SqLibAPI_getdefaultdelegate              SqLib_getdefaultdelegate;
+    extern SqLibAPI_getmemberhandle                 SqLib_getmemberhandle;
+    extern SqLibAPI_getbyhandle                     SqLib_getbyhandle;
+    extern SqLibAPI_setbyhandle                     SqLib_setbyhandle;
 
     //object manipulation
-    extern sqapi_pushroottable                  sq_pushroottable;
-    extern sqapi_pushregistrytable              sq_pushregistrytable;
-    extern sqapi_pushconsttable                 sq_pushconsttable;
-    extern sqapi_setroottable                   sq_setroottable;
-    extern sqapi_setconsttable                  sq_setconsttable;
-    extern sqapi_newslot                        sq_newslot;
-    extern sqapi_deleteslot                     sq_deleteslot;
-    extern sqapi_set                            sq_set;
-    extern sqapi_get                            sq_get;
-    extern sqapi_rawget                         sq_rawget;
-    extern sqapi_rawset                         sq_rawset;
-    extern sqapi_rawdeleteslot                  sq_rawdeleteslot;
-    extern sqapi_newmember                      sq_newmember;
-    extern sqapi_rawnewmember                   sq_rawnewmember;
-    extern sqapi_arrayappend                    sq_arrayappend;
-    extern sqapi_arraypop                       sq_arraypop;
-    extern sqapi_arrayresize                    sq_arrayresize;
-    extern sqapi_arrayreverse                   sq_arrayreverse;
-    extern sqapi_arrayremove                    sq_arrayremove;
-    extern sqapi_arrayinsert                    sq_arrayinsert;
-    extern sqapi_setdelegate                    sq_setdelegate;
-    extern sqapi_getdelegate                    sq_getdelegate;
-    extern sqapi_clone                          sq_clone;
-    extern sqapi_setfreevariable                sq_setfreevariable;
-    extern sqapi_next                           sq_next;
-    extern sqapi_getweakrefval                  sq_getweakrefval;
-    extern sqapi_clear                          sq_clear;
+    extern SqLibAPI_pushroottable                   SqLib_pushroottable;
+    extern SqLibAPI_pushregistrytable               SqLib_pushregistrytable;
+    extern SqLibAPI_pushconsttable                  SqLib_pushconsttable;
+    extern SqLibAPI_setroottable                    SqLib_setroottable;
+    extern SqLibAPI_setconsttable                   SqLib_setconsttable;
+    extern SqLibAPI_newslot                         SqLib_newslot;
+    extern SqLibAPI_deleteslot                      SqLib_deleteslot;
+    extern SqLibAPI_set                             SqLib_set;
+    extern SqLibAPI_get                             SqLib_get;
+    extern SqLibAPI_rawget                          SqLib_rawget;
+    extern SqLibAPI_rawset                          SqLib_rawset;
+    extern SqLibAPI_rawdeleteslot                   SqLib_rawdeleteslot;
+    extern SqLibAPI_newmember                       SqLib_newmember;
+    extern SqLibAPI_rawnewmember                    SqLib_rawnewmember;
+    extern SqLibAPI_arrayappend                     SqLib_arrayappend;
+    extern SqLibAPI_arraypop                        SqLib_arraypop;
+    extern SqLibAPI_arrayresize                     SqLib_arrayresize;
+    extern SqLibAPI_arrayreverse                    SqLib_arrayreverse;
+    extern SqLibAPI_arrayremove                     SqLib_arrayremove;
+    extern SqLibAPI_arrayinsert                     SqLib_arrayinsert;
+    extern SqLibAPI_setdelegate                     SqLib_setdelegate;
+    extern SqLibAPI_getdelegate                     SqLib_getdelegate;
+    extern SqLibAPI_clone                           SqLib_clone;
+    extern SqLibAPI_setfreevariable                 SqLib_setfreevariable;
+    extern SqLibAPI_next                            SqLib_next;
+    extern SqLibAPI_getweakrefval                   SqLib_getweakrefval;
+    extern SqLibAPI_clear                           SqLib_clear;
 
     //calls
-    extern sqapi_call                           sq_call;
-    extern sqapi_resume                         sq_resume;
-    extern sqapi_getlocal                       sq_getlocal;
-    extern sqapi_getcallee                      sq_getcallee;
-    extern sqapi_getfreevariable                sq_getfreevariable;
-    extern sqapi_throwerror                     sq_throwerror;
-    extern sqapi_throwobject                    sq_throwobject;
-    extern sqapi_reseterror                     sq_reseterror;
-    extern sqapi_getlasterror                   sq_getlasterror;
+    extern SqLibAPI_call                            SqLib_call;
+    extern SqLibAPI_resume                          SqLib_resume;
+    extern SqLibAPI_getlocal                        SqLib_getlocal;
+    extern SqLibAPI_getcallee                       SqLib_getcallee;
+    extern SqLibAPI_getfreevariable                 SqLib_getfreevariable;
+    extern SqLibAPI_throwerror                      SqLib_throwerror;
+    extern SqLibAPI_throwobject                     SqLib_throwobject;
+    extern SqLibAPI_reseterror                      SqLib_reseterror;
+    extern SqLibAPI_getlasterror                    SqLib_getlasterror;
 
     //raw object handling
-    extern sqapi_getstackobj                    sq_getstackobj;
-    extern sqapi_pushobject                     sq_pushobject;
-    extern sqapi_addref                         sq_addref;
-    extern sqapi_release                        sq_release;
-    extern sqapi_getrefcount                    sq_getrefcount;
-    extern sqapi_resetobject                    sq_resetobject;
-    extern sqapi_objtostring                    sq_objtostring;
-    extern sqapi_objtobool                      sq_objtobool;
-    extern sqapi_objtointeger                   sq_objtointeger;
-    extern sqapi_objtofloat                     sq_objtofloat;
-    extern sqapi_objtouserpointer               sq_objtouserpointer;
-    extern sqapi_getobjtypetag                  sq_getobjtypetag;
-    extern sqapi_getvmrefcount                  sq_getvmrefcount;
+    extern SqLibAPI_getstackobj                     SqLib_getstackobj;
+    extern SqLibAPI_pushobject                      SqLib_pushobject;
+    extern SqLibAPI_addref                          SqLib_addref;
+    extern SqLibAPI_release                         SqLib_release;
+    extern SqLibAPI_getrefcount                     SqLib_getrefcount;
+    extern SqLibAPI_resetobject                     SqLib_resetobject;
+    extern SqLibAPI_objtostring                     SqLib_objtostring;
+    extern SqLibAPI_objtobool                       SqLib_objtobool;
+    extern SqLibAPI_objtointeger                    SqLib_objtointeger;
+    extern SqLibAPI_objtofloat                      SqLib_objtofloat;
+    extern SqLibAPI_objtouserpointer                SqLib_objtouserpointer;
+    extern SqLibAPI_getobjtypetag                   SqLib_getobjtypetag;
+    extern SqLibAPI_getvmrefcount                   SqLib_getvmrefcount;
 
     //GC
-    extern sqapi_collectgarbage                 sq_collectgarbage;
-    extern sqapi_resurrectunreachable           sq_resurrectunreachable;
+    extern SqLibAPI_collectgarbage                  SqLib_collectgarbage;
+    extern SqLibAPI_resurrectunreachable            SqLib_resurrectunreachable;
 
     //serialization
-    extern sqapi_writeclosure                   sq_writeclosure;
-    extern sqapi_readclosure                    sq_readclosure;
+    extern SqLibAPI_writeclosure                    SqLib_writeclosure;
+    extern SqLibAPI_readclosure                     SqLib_readclosure;
 
     //mem allocation
-    extern sqapi_malloc                         sq_malloc;
-    extern sqapi_realloc                        sq_realloc;
-    extern sqapi_free                           sq_free;
+    extern SqLibAPI_malloc                          SqLib_malloc;
+    extern SqLibAPI_realloc                         SqLib_realloc;
+    extern SqLibAPI_free                            SqLib_free;
 
     //debug
-    extern sqapi_stackinfos                     sq_stackinfos;
-    extern sqapi_setdebughook                   sq_setdebughook;
-    extern sqapi_setnativedebughook             sq_setnativedebughook;
+    extern SqLibAPI_stackinfos                      SqLib_stackinfos;
+    extern SqLibAPI_setdebughook                    SqLib_setdebughook;
+    extern SqLibAPI_setnativedebughook              SqLib_setnativedebughook;
 
     //compiler helpers
-    extern sqapi_loadfile                       sqstd_loadfile;
-    extern sqapi_dofile                         sqstd_dofile;
-    extern sqapi_writeclosuretofile             sqstd_writeclosuretofile;
+    extern SqLibAPI_loadfile                        SqLib_loadfile;
+    extern SqLibAPI_dofile                          SqLib_dofile;
+    extern SqLibAPI_writeclosuretofile              SqLib_writeclosuretofile;
 
     //blob
-    extern sqapi_createblob                     sqstd_createblob;
-    extern sqapi_getblob                        sqstd_getblob;
-    extern sqapi_getblobsize                    sqstd_getblobsize;
+    extern SqLibAPI_createblob                      SqLib_createblob;
+    extern SqLibAPI_getblob                         SqLib_getblob;
+    extern SqLibAPI_getblobsize                     SqLib_getblobsize;
 
     //string
-    extern sqapi_format                         sqstd_format;
+    extern SqLibAPI_format                          SqLib_format;
+
+    //vm
+    #define sq_open                                 SqLib_open
+    #define sq_newthread                            SqLib_newthread
+    #define sq_seterrorhandler                      SqLib_seterrorhandler
+    #define sq_close                                SqLib_close
+    #define sq_setforeignptr                        SqLib_setforeignptr
+    #define sq_getforeignptr                        SqLib_getforeignptr
+    #define sq_setsharedforeignptr                  SqLib_setsharedforeignptr
+    #define sq_getsharedforeignptr                  SqLib_getsharedforeignptr
+    #define sq_setvmreleasehook                     SqLib_setvmreleasehook
+    #define sq_getvmreleasehook                     SqLib_getvmreleasehook
+    #define sq_setsharedreleasehook                 SqLib_setsharedreleasehook
+    #define sq_getsharedreleasehook                 SqLib_getsharedreleasehook
+    #define sq_setprintfunc                         SqLib_setprintfunc
+    #define sq_getprintfunc                         SqLib_getprintfunc
+    #define sq_geterrorfunc                         SqLib_geterrorfunc
+    #define sq_suspendvm                            SqLib_suspendvm
+    #define sq_wakeupvm                             SqLib_wakeupvm
+    #define sq_getvmstate                           SqLib_getvmstate
+    #define sq_getversion                           SqLib_getversion
+
+    //compiler
+    #define sq_compile                              SqLib_compile
+    #define sq_compilebuffer                        SqLib_compilebuffer
+    #define sq_enabledebuginfo                      SqLib_enabledebuginfo
+    #define sq_notifyallexceptions                  SqLib_notifyallexceptions
+    #define sq_setcompilererrorhandler              SqLib_setcompilererrorhandler
+
+    //stack operations
+    #define sq_push                                 SqLib_push
+    #define sq_pop                                  SqLib_pop
+    #define sq_poptop                               SqLib_poptop
+    #define sq_remove                               SqLib_remove
+    #define sq_gettop                               SqLib_gettop
+    #define sq_settop                               SqLib_settop
+    #define sq_reservestack                         SqLib_reservestack
+    #define sq_cmp                                  SqLib_cmp
+    #define sq_move                                 SqLib_move
+
+    //object creation handling
+    #define sq_newuserdata                          SqLib_newuserdata
+    #define sq_newtable                             SqLib_newtable
+    #define sq_newtableex                           SqLib_newtableex
+    #define sq_newarray                             SqLib_newarray
+    #define sq_newclosure                           SqLib_newclosure
+    #define sq_setparamscheck                       SqLib_setparamscheck
+    #define sq_bindenv                              SqLib_bindenv
+    #define sq_setclosureroot                       SqLib_setclosureroot
+    #define sq_getclosureroot                       SqLib_getclosureroot
+    #define sq_pushstring                           SqLib_pushstring
+    #define sq_pushfloat                            SqLib_pushfloat
+    #define sq_pushinteger                          SqLib_pushinteger
+    #define sq_pushbool                             SqLib_pushbool
+    #define sq_pushuserpointer                      SqLib_pushuserpointer
+    #define sq_pushnull                             SqLib_pushnull
+    #define sq_pushthread                           SqLib_pushthread
+    #define sq_gettype                              SqLib_gettype
+    #define sq_typeof                               SqLib_typeof
+    #define sq_getsize                              SqLib_getsize
+    #define sq_gethash                              SqLib_gethash
+    #define sq_getbase                              SqLib_getbase
+    #define sq_instanceof                           SqLib_instanceof
+    #define sq_tostring                             SqLib_tostring
+    #define sq_tobool                               SqLib_tobool
+    #define sq_getstringandsize                     SqLib_getstringandsize
+    #define sq_getstring                            SqLib_getstring
+    #define sq_getinteger                           SqLib_getinteger
+    #define sq_getfloat                             SqLib_getfloat
+    #define sq_getbool                              SqLib_getbool
+    #define sq_getthread                            SqLib_getthread
+    #define sq_getuserpointer                       SqLib_getuserpointer
+    #define sq_getuserdata                          SqLib_getuserdata
+    #define sq_settypetag                           SqLib_settypetag
+    #define sq_gettypetag                           SqLib_gettypetag
+    #define sq_setreleasehook                       SqLib_setreleasehook
+    #define sq_getreleasehook                       SqLib_getreleasehook
+    #define sq_getscratchpad                        SqLib_getscratchpad
+    #define sq_getfunctioninfo                      SqLib_getfunctioninfo
+    #define sq_getclosureinfo                       SqLib_getclosureinfo
+    #define sq_getclosurename                       SqLib_getclosurename
+    #define sq_setnativeclosurename                 SqLib_setnativeclosurename
+    #define sq_setinstanceup                        SqLib_setinstanceup
+    #define sq_getinstanceup                        SqLib_getinstanceup
+    #define sq_setclassudsize                       SqLib_setclassudsize
+    #define sq_newclass                             SqLib_newclass
+    #define sq_createinstance                       SqLib_createinstance
+    #define sq_setattributes                        SqLib_setattributes
+    #define sq_getattributes                        SqLib_getattributes
+    #define sq_getclass                             SqLib_getclass
+    #define sq_weakref                              SqLib_weakref
+    #define sq_getdefaultdelegate                   SqLib_getdefaultdelegate
+    #define sq_getmemberhandle                      SqLib_getmemberhandle
+    #define sq_getbyhandle                          SqLib_getbyhandle
+    #define sq_setbyhandle                          SqLib_setbyhandle
+
+    //object manipulation
+    #define sq_pushroottable                        SqLib_pushroottable
+    #define sq_pushregistrytable                    SqLib_pushregistrytable
+    #define sq_pushconsttable                       SqLib_pushconsttable
+    #define sq_setroottable                         SqLib_setroottable
+    #define sq_setconsttable                        SqLib_setconsttable
+    #define sq_newslot                              SqLib_newslot
+    #define sq_deleteslot                           SqLib_deleteslot
+    #define sq_set                                  SqLib_set
+    #define sq_get                                  SqLib_get
+    #define sq_rawget                               SqLib_rawget
+    #define sq_rawset                               SqLib_rawset
+    #define sq_rawdeleteslot                        SqLib_rawdeleteslot
+    #define sq_newmember                            SqLib_newmember
+    #define sq_rawnewmember                         SqLib_rawnewmember
+    #define sq_arrayappend                          SqLib_arrayappend
+    #define sq_arraypop                             SqLib_arraypop
+    #define sq_arrayresize                          SqLib_arrayresize
+    #define sq_arrayreverse                         SqLib_arrayreverse
+    #define sq_arrayremove                          SqLib_arrayremove
+    #define sq_arrayinsert                          SqLib_arrayinsert
+    #define sq_setdelegate                          SqLib_setdelegate
+    #define sq_getdelegate                          SqLib_getdelegate
+    #define sq_clone                                SqLib_clone
+    #define sq_setfreevariable                      SqLib_setfreevariable
+    #define sq_next                                 SqLib_next
+    #define sq_getweakrefval                        SqLib_getweakrefval
+    #define sq_clear                                SqLib_clear
+
+    //calls
+    #define sq_call                                 SqLib_call
+    #define sq_resume                               SqLib_resume
+    #define sq_getlocal                             SqLib_getlocal
+    #define sq_getcallee                            SqLib_getcallee
+    #define sq_getfreevariable                      SqLib_getfreevariable
+    #define sq_throwerror                           SqLib_throwerror
+    #define sq_throwobject                          SqLib_throwobject
+    #define sq_reseterror                           SqLib_reseterror
+    #define sq_getlasterror                         SqLib_getlasterror
+
+    //raw object handling
+    #define sq_getstackobj                          SqLib_getstackobj
+    #define sq_pushobject                           SqLib_pushobject
+    #define sq_addref                               SqLib_addref
+    #define sq_release                              SqLib_release
+    #define sq_getrefcount                          SqLib_getrefcount
+    #define sq_resetobject                          SqLib_resetobject
+    #define sq_objtostring                          SqLib_objtostring
+    #define sq_objtobool                            SqLib_objtobool
+    #define sq_objtointeger                         SqLib_objtointeger
+    #define sq_objtofloat                           SqLib_objtofloat
+    #define sq_objtouserpointer                     SqLib_objtouserpointer
+    #define sq_getobjtypetag                        SqLib_getobjtypetag
+    #define sq_getvmrefcount                        SqLib_getvmrefcount
+
+    //GC
+    #define sq_collectgarbage                       SqLib_collectgarbage
+    #define sq_resurrectunreachable                 SqLib_resurrectunreachable
+
+    //serialization
+    #define sq_writeclosure                         SqLib_writeclosure
+    #define sq_readclosure                          SqLib_readclosure
+
+    //mem allocation
+    #define sq_malloc                               SqLib_malloc
+    #define sq_realloc                              SqLib_realloc
+    #define sq_free                                 SqLib_free
+
+    //debug
+    #define sq_stackinfos                           SqLib_stackinfos
+    #define sq_setdebughook                         SqLib_setdebughook
+    #define sq_setnativedebughook                   SqLib_setnativedebughook
+
+    //compiler helpers
+    #define sqstd_loadfile                          SqLib_loadfile
+    #define sqstd_dofile                            SqLib_dofile
+    #define sqstd_writeclosuretofile                SqLib_writeclosuretofile
+
+    //blob
+    #define sqstd_createblob                        SqLib_createblob
+    #define sqstd_getblob                           SqLib_getblob
+    #define sqstd_getblobsize                       SqLib_getblobsize
+
+    //string
+    #define sqstd_format                            SqLib_format
 
 #endif // SQMOD_PLUGIN_API
 
diff --git a/shared/SqMod.h b/shared/SqMod.h
index 8e6355ff..ac3ceccf 100644
--- a/shared/SqMod.h
+++ b/shared/SqMod.h
@@ -62,204 +62,206 @@ extern "C" {
     #define SQMOD_API_VER           1
 
     //primitive functions
-    typedef HSQAPI          (*SqEx_GetSquirrelAPI) (void);
-    typedef HSQUIRRELVM     (*SqEx_GetSquirrelVM) (void);
+    typedef HSQUIRRELVM     (*SqModAPI_GetSquirrelVM) (void);
     //logging utilities
-    typedef void            (*SqEx_LogMessage) (const SQChar * fmt, ...);
+    typedef void            (*SqModAPI_LogMessage) (const SQChar * fmt, ...);
     //script loading
-    typedef SQRESULT        (*SqEx_LoadScript) (const SQChar * filepath, SQBool delay);
+    typedef SQRESULT        (*SqModAPI_LoadScript) (const SQChar * filepath, SQBool delay);
     //numeric utilities
-    typedef SQRESULT        (*SqEx_GetSLongValue) (HSQUIRRELVM vm, SQInteger idx, SqInt64 * num);
-    typedef SQRESULT        (*SqEx_PushSLongObject) (HSQUIRRELVM vm, SqInt64 num);
-    typedef SQRESULT        (*SqEx_GetULongValue) (HSQUIRRELVM vm, SQInteger idx, SqUint64 * num);
-    typedef SQRESULT        (*SqEx_PushULongObject) (HSQUIRRELVM vm, SqUint64 num);
+    typedef SQRESULT        (*SqModAPI_GetSLongValue) (HSQUIRRELVM vm, SQInteger idx, SqInt64 * num);
+    typedef SQRESULT        (*SqModAPI_PushSLongObject) (HSQUIRRELVM vm, SqInt64 num);
+    typedef SQRESULT        (*SqModAPI_GetULongValue) (HSQUIRRELVM vm, SQInteger idx, SqUint64 * num);
+    typedef SQRESULT        (*SqModAPI_PushULongObject) (HSQUIRRELVM vm, SqUint64 num);
     //time utilities
-    typedef SqInt64         (*SqEx_GetCurrentSysTime) (void);
-    typedef SqInt64         (*SqEx_GetEpochTimeMicro) (void);
-    typedef SqInt64         (*SqEx_GetEpochTimeMilli) (void);
-    typedef SQBool          (*SqEx_ValidDate) (uint16_t year, uint8_t month, uint8_t day);
-    typedef SQBool          (*SqEx_IsLeapYear) (uint16_t year);
-    typedef uint16_t        (*SqEx_DaysInYear) (uint16_t year);
-    typedef uint8_t         (*SqEx_DaysInMonth) (uint16_t year, uint8_t month);
-    typedef uint16_t        (*SqEx_DayOfYear) (uint16_t year, uint8_t month, uint8_t day);
-    typedef SqInt64         (*SqEx_DateRangeToSeconds) (uint16_t lyear, uint8_t lmonth, uint8_t lday, uint16_t ryear, uint8_t rmonth, uint8_t rday);
-    typedef SQRESULT        (*SqEx_GetTimestamp) (HSQUIRRELVM vm, SQInteger idx, SqInt64 * num);
-    typedef SQRESULT        (*SqEx_PushTimestamp) (HSQUIRRELVM vm, SqInt64 num);
-    typedef SQRESULT        (*SqEx_GetDate) (HSQUIRRELVM vm, SQInteger idx, uint16_t * year, uint8_t * month, uint8_t * day);
-    typedef SQRESULT        (*SqEx_PushDate) (HSQUIRRELVM vm, uint16_t year, uint8_t month, uint8_t day);
-    typedef SQRESULT        (*SqEx_GetTime) (HSQUIRRELVM vm, SQInteger idx, uint8_t * hour, uint8_t * minute, uint8_t * second, uint16_t * millisecond);
-    typedef SQRESULT        (*SqEx_PushTime) (HSQUIRRELVM vm, uint8_t hour, uint8_t minute, uint8_t second, uint16_t millisecond);
-    typedef SQRESULT        (*SqEx_GetDatetime) (HSQUIRRELVM vm, SQInteger idx, uint16_t * year, uint8_t * month, uint8_t * day, uint8_t * hour, uint8_t * minute, uint8_t * second, uint16_t * millisecond);
-    typedef SQRESULT        (*SqEx_PushDatetime) (HSQUIRRELVM vm, uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint16_t millisecond);
+    typedef SqInt64         (*SqModAPI_GetCurrentSysTime) (void);
+    typedef SqInt64         (*SqModAPI_GetEpochTimeMicro) (void);
+    typedef SqInt64         (*SqModAPI_GetEpochTimeMilli) (void);
+    typedef SQBool          (*SqModAPI_ValidDate) (uint16_t year, uint8_t month, uint8_t day);
+    typedef SQBool          (*SqModAPI_IsLeapYear) (uint16_t year);
+    typedef uint16_t        (*SqModAPI_DaysInYear) (uint16_t year);
+    typedef uint8_t         (*SqModAPI_DaysInMonth) (uint16_t year, uint8_t month);
+    typedef uint16_t        (*SqModAPI_DayOfYear) (uint16_t year, uint8_t month, uint8_t day);
+    typedef SqInt64         (*SqModAPI_DateRangeToSeconds) (uint16_t lyear, uint8_t lmonth, uint8_t lday, uint16_t ryear, uint8_t rmonth, uint8_t rday);
+    typedef SQRESULT        (*SqModAPI_GetTimestamp) (HSQUIRRELVM vm, SQInteger idx, SqInt64 * num);
+    typedef SQRESULT        (*SqModAPI_PushTimestamp) (HSQUIRRELVM vm, SqInt64 num);
+    typedef SQRESULT        (*SqModAPI_GetDate) (HSQUIRRELVM vm, SQInteger idx, uint16_t * year, uint8_t * month, uint8_t * day);
+    typedef SQRESULT        (*SqModAPI_PushDate) (HSQUIRRELVM vm, uint16_t year, uint8_t month, uint8_t day);
+    typedef SQRESULT        (*SqModAPI_GetTime) (HSQUIRRELVM vm, SQInteger idx, uint8_t * hour, uint8_t * minute, uint8_t * second, uint16_t * millisecond);
+    typedef SQRESULT        (*SqModAPI_PushTime) (HSQUIRRELVM vm, uint8_t hour, uint8_t minute, uint8_t second, uint16_t millisecond);
+    typedef SQRESULT        (*SqModAPI_GetDatetime) (HSQUIRRELVM vm, SQInteger idx, uint16_t * year, uint8_t * month, uint8_t * day, uint8_t * hour, uint8_t * minute, uint8_t * second, uint16_t * millisecond);
+    typedef SQRESULT        (*SqModAPI_PushDatetime) (HSQUIRRELVM vm, uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint16_t millisecond);
     //stack utilities
-    typedef SQInteger       (*SqEx_PopStackInteger) (HSQUIRRELVM vm, SQInteger idx);
-    typedef SQFloat         (*SqEx_PopStackFloat) (HSQUIRRELVM vm, SQInteger idx);
-    typedef SqInt64         (*SqEx_PopStackSLong) (HSQUIRRELVM vm, SQInteger idx);
-    typedef SqUint64        (*SqEx_PopStackULong) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SQInteger       (*SqModAPI_PopStackInteger) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SQFloat         (*SqModAPI_PopStackFloat) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SqInt64         (*SqModAPI_PopStackSLong) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SqUint64        (*SqModAPI_PopStackULong) (HSQUIRRELVM vm, SQInteger idx);
     //buffer utilities
-    typedef SQRESULT        (*SqEx_PushBuffer) (HSQUIRRELVM vm, SQInteger size, SQInteger cursor);
-    typedef SQRESULT        (*SqEx_PushBufferData) (HSQUIRRELVM vm, const char * data, SQInteger size, SQInteger cursor);
-    typedef SQRESULT        (*SqEx_GetBufferInfo) (HSQUIRRELVM vm, SQInteger idx, const char ** ptr, SQInteger * size, SQInteger * cursor);
-    typedef const char *    (*SqEx_GetBufferData) (HSQUIRRELVM vm, SQInteger idx);
-    typedef SQInteger       (*SqEx_GetBufferSize) (HSQUIRRELVM vm, SQInteger idx);
-    typedef SQInteger       (*SqEx_GetBufferCursor) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SQRESULT        (*SqModAPI_PushBuffer) (HSQUIRRELVM vm, SQInteger size, SQInteger cursor);
+    typedef SQRESULT        (*SqModAPI_PushBufferData) (HSQUIRRELVM vm, const char * data, SQInteger size, SQInteger cursor);
+    typedef SQRESULT        (*SqModAPI_GetBufferInfo) (HSQUIRRELVM vm, SQInteger idx, const char ** ptr, SQInteger * size, SQInteger * cursor);
+    typedef const char *    (*SqModAPI_GetBufferData) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SQInteger       (*SqModAPI_GetBufferSize) (HSQUIRRELVM vm, SQInteger idx);
+    typedef SQInteger       (*SqModAPI_GetBufferCursor) (HSQUIRRELVM vm, SQInteger idx);
 
     /* --------------------------------------------------------------------------------------------
      * Allows modules to interface with the plug-in API without linking of any sorts
     */
     typedef struct
     {
-        unsigned int                        StructSize;
         //primitive functions
-        SqEx_GetSquirrelAPI                 GetSquirrelAPI;
-        SqEx_GetSquirrelVM                  GetSquirrelVM;
+        SqModAPI_GetSquirrelVM                      GetSquirrelVM;
         //logging utilities
-        SqEx_LogMessage                     LogDbg;
-        SqEx_LogMessage                     LogUsr;
-        SqEx_LogMessage                     LogScs;
-        SqEx_LogMessage                     LogInf;
-        SqEx_LogMessage                     LogWrn;
-        SqEx_LogMessage                     LogErr;
-        SqEx_LogMessage                     LogFtl;
-        SqEx_LogMessage                     LogSDbg;
-        SqEx_LogMessage                     LogSUsr;
-        SqEx_LogMessage                     LogSScs;
-        SqEx_LogMessage                     LogSInf;
-        SqEx_LogMessage                     LogSWrn;
-        SqEx_LogMessage                     LogSErr;
-        SqEx_LogMessage                     LogSFtl;
+        SqModAPI_LogMessage                         LogDbg;
+        SqModAPI_LogMessage                         LogUsr;
+        SqModAPI_LogMessage                         LogScs;
+        SqModAPI_LogMessage                         LogInf;
+        SqModAPI_LogMessage                         LogWrn;
+        SqModAPI_LogMessage                         LogErr;
+        SqModAPI_LogMessage                         LogFtl;
+        SqModAPI_LogMessage                         LogSDbg;
+        SqModAPI_LogMessage                         LogSUsr;
+        SqModAPI_LogMessage                         LogSScs;
+        SqModAPI_LogMessage                         LogSInf;
+        SqModAPI_LogMessage                         LogSWrn;
+        SqModAPI_LogMessage                         LogSErr;
+        SqModAPI_LogMessage                         LogSFtl;
         //script loading
-        SqEx_LoadScript                     LoadScript;
+        SqModAPI_LoadScript                         LoadScript;
         //numeric utilities
-        SqEx_GetSLongValue                  GetSLongValue;
-        SqEx_PushSLongObject                PushSLongObject;
-        SqEx_GetULongValue                  GetULongValue;
-        SqEx_PushULongObject                PushULongObject;
+        SqModAPI_GetSLongValue                      GetSLongValue;
+        SqModAPI_PushSLongObject                    PushSLongObject;
+        SqModAPI_GetULongValue                      GetULongValue;
+        SqModAPI_PushULongObject                    PushULongObject;
         //time utilities
-        SqEx_GetCurrentSysTime              GetCurrentSysTime;
-        SqEx_GetEpochTimeMicro              GetEpochTimeMicro;
-        SqEx_GetEpochTimeMilli              GetEpochTimeMilli;
-        SqEx_ValidDate                      ValidDate;
-        SqEx_IsLeapYear                     IsLeapYear;
-        SqEx_DaysInYear                     DaysInYear;
-        SqEx_DaysInMonth                    DaysInMonth;
-        SqEx_DayOfYear                      DayOfYear;
-        SqEx_DateRangeToSeconds             DateRangeToSeconds;
-        SqEx_GetTimestamp                   GetTimestamp;
-        SqEx_PushTimestamp                  PushTimestamp;
-        SqEx_GetDate                        GetDate;
-        SqEx_PushDate                       PushDate;
-        SqEx_GetTime                        GetTime;
-        SqEx_PushTime                       PushTime;
-        SqEx_GetDatetime                    GetDatetime;
-        SqEx_PushDatetime                   PushDatetime;
+        SqModAPI_GetCurrentSysTime                  GetCurrentSysTime;
+        SqModAPI_GetEpochTimeMicro                  GetEpochTimeMicro;
+        SqModAPI_GetEpochTimeMilli                  GetEpochTimeMilli;
+        SqModAPI_ValidDate                          ValidDate;
+        SqModAPI_IsLeapYear                         IsLeapYear;
+        SqModAPI_DaysInYear                         DaysInYear;
+        SqModAPI_DaysInMonth                        DaysInMonth;
+        SqModAPI_DayOfYear                          DayOfYear;
+        SqModAPI_DateRangeToSeconds                 DateRangeToSeconds;
+        SqModAPI_GetTimestamp                       GetTimestamp;
+        SqModAPI_PushTimestamp                      PushTimestamp;
+        SqModAPI_GetDate                            GetDate;
+        SqModAPI_PushDate                           PushDate;
+        SqModAPI_GetTime                            GetTime;
+        SqModAPI_PushTime                           PushTime;
+        SqModAPI_GetDatetime                        GetDatetime;
+        SqModAPI_PushDatetime                       PushDatetime;
         //stack utilities
-        SqEx_PopStackInteger                PopStackInteger;
-        SqEx_PopStackFloat                  PopStackFloat;
-        SqEx_PopStackSLong                  PopStackSLong;
-        SqEx_PopStackULong                  PopStackULong;
+        SqModAPI_PopStackInteger                    PopStackInteger;
+        SqModAPI_PopStackFloat                      PopStackFloat;
+        SqModAPI_PopStackSLong                      PopStackSLong;
+        SqModAPI_PopStackULong                      PopStackULong;
         //buffer utilities
-        SqEx_PushBuffer                     PushBuffer;
-        SqEx_PushBufferData                 PushBufferData;
-        SqEx_GetBufferInfo                  GetBufferInfo;
-        SqEx_GetBufferData                  GetBufferData;
-        SqEx_GetBufferSize                  GetBufferSize;
-        SqEx_GetBufferCursor                GetBufferCursor;
-    } sq_exports, SQEXPORTS, *HSQEXPORTS;
+        SqModAPI_PushBuffer                         PushBuffer;
+        SqModAPI_PushBufferData                     PushBufferData;
+        SqModAPI_GetBufferInfo                      GetBufferInfo;
+        SqModAPI_GetBufferData                      GetBufferData;
+        SqModAPI_GetBufferSize                      GetBufferSize;
+        SqModAPI_GetBufferCursor                    GetBufferCursor;
+    } sq_modapi, SQMODAPI, *HSQMODAPI;
 
 #ifdef SQMOD_PLUGIN_API
 
     //primitive functions
-    extern SqEx_GetSquirrelAPI                  SqMod_GetSquirrelAPI;
-    extern SqEx_GetSquirrelVM                   SqMod_GetSquirrelVM;
+    extern SqModAPI_GetSquirrelVM                   SqMod_GetSquirrelVM;
 
     //logging utilities
-    extern SqEx_LogMessage                      SqMod_LogDbg;
-    extern SqEx_LogMessage                      SqMod_LogUsr;
-    extern SqEx_LogMessage                      SqMod_LogScs;
-    extern SqEx_LogMessage                      SqMod_LogInf;
-    extern SqEx_LogMessage                      SqMod_LogWrn;
-    extern SqEx_LogMessage                      SqMod_LogErr;
-    extern SqEx_LogMessage                      SqMod_LogFtl;
-    extern SqEx_LogMessage                      SqMod_LogSDbg;
-    extern SqEx_LogMessage                      SqMod_LogSUsr;
-    extern SqEx_LogMessage                      SqMod_LogSScs;
-    extern SqEx_LogMessage                      SqMod_LogSInf;
-    extern SqEx_LogMessage                      SqMod_LogSWrn;
-    extern SqEx_LogMessage                      SqMod_LogSErr;
-    extern SqEx_LogMessage                      SqMod_LogSFtl;
+    extern SqModAPI_LogMessage                      SqMod_LogDbg;
+    extern SqModAPI_LogMessage                      SqMod_LogUsr;
+    extern SqModAPI_LogMessage                      SqMod_LogScs;
+    extern SqModAPI_LogMessage                      SqMod_LogInf;
+    extern SqModAPI_LogMessage                      SqMod_LogWrn;
+    extern SqModAPI_LogMessage                      SqMod_LogErr;
+    extern SqModAPI_LogMessage                      SqMod_LogFtl;
+    extern SqModAPI_LogMessage                      SqMod_LogSDbg;
+    extern SqModAPI_LogMessage                      SqMod_LogSUsr;
+    extern SqModAPI_LogMessage                      SqMod_LogSScs;
+    extern SqModAPI_LogMessage                      SqMod_LogSInf;
+    extern SqModAPI_LogMessage                      SqMod_LogSWrn;
+    extern SqModAPI_LogMessage                      SqMod_LogSErr;
+    extern SqModAPI_LogMessage                      SqMod_LogSFtl;
 
     //script loading
-    extern SqEx_LoadScript                      SqMod_LoadScript;
+    extern SqModAPI_LoadScript                      SqMod_LoadScript;
 
     //numeric utilities
-    extern SqEx_GetSLongValue                   SqMod_GetSLongValue;
-    extern SqEx_PushSLongObject                 SqMod_PushSLongObject;
-    extern SqEx_GetULongValue                   SqMod_GetULongValue;
-    extern SqEx_PushULongObject                 SqMod_PushULongObject;
+    extern SqModAPI_GetSLongValue                   SqMod_GetSLongValue;
+    extern SqModAPI_PushSLongObject                 SqMod_PushSLongObject;
+    extern SqModAPI_GetULongValue                   SqMod_GetULongValue;
+    extern SqModAPI_PushULongObject                 SqMod_PushULongObject;
 
     //time utilities
-    extern SqEx_GetCurrentSysTime               SqMod_GetCurrentSysTime;
-    extern SqEx_GetEpochTimeMicro               SqMod_GetEpochTimeMicro;
-    extern SqEx_GetEpochTimeMilli               SqMod_GetEpochTimeMilli;
-    extern SqEx_ValidDate                       SqMod_ValidDate;
-    extern SqEx_IsLeapYear                      SqMod_IsLeapYear;
-    extern SqEx_DaysInYear                      SqMod_DaysInYear;
-    extern SqEx_DaysInMonth                     SqMod_DaysInMonth;
-    extern SqEx_DayOfYear                       SqMod_DayOfYear;
-    extern SqEx_DateRangeToSeconds              SqMod_DateRangeToSeconds;
-    extern SqEx_GetTimestamp                    SqMod_GetTimestamp;
-    extern SqEx_PushTimestamp                   SqMod_PushTimestamp;
-    extern SqEx_GetDate                         SqMod_GetDate;
-    extern SqEx_PushDate                        SqMod_PushDate;
-    extern SqEx_GetTime                         SqMod_GetTime;
-    extern SqEx_PushTime                        SqMod_PushTime;
-    extern SqEx_GetDatetime                     SqMod_GetDatetime;
-    extern SqEx_PushDatetime                    SqMod_PushDatetime;
+    extern SqModAPI_GetCurrentSysTime               SqMod_GetCurrentSysTime;
+    extern SqModAPI_GetEpochTimeMicro               SqMod_GetEpochTimeMicro;
+    extern SqModAPI_GetEpochTimeMilli               SqMod_GetEpochTimeMilli;
+    extern SqModAPI_ValidDate                       SqMod_ValidDate;
+    extern SqModAPI_IsLeapYear                      SqMod_IsLeapYear;
+    extern SqModAPI_DaysInYear                      SqMod_DaysInYear;
+    extern SqModAPI_DaysInMonth                     SqMod_DaysInMonth;
+    extern SqModAPI_DayOfYear                       SqMod_DayOfYear;
+    extern SqModAPI_DateRangeToSeconds              SqMod_DateRangeToSeconds;
+    extern SqModAPI_GetTimestamp                    SqMod_GetTimestamp;
+    extern SqModAPI_PushTimestamp                   SqMod_PushTimestamp;
+    extern SqModAPI_GetDate                         SqMod_GetDate;
+    extern SqModAPI_PushDate                        SqMod_PushDate;
+    extern SqModAPI_GetTime                         SqMod_GetTime;
+    extern SqModAPI_PushTime                        SqMod_PushTime;
+    extern SqModAPI_GetDatetime                     SqMod_GetDatetime;
+    extern SqModAPI_PushDatetime                    SqMod_PushDatetime;
 
     //stack utilities
-    extern SqEx_PopStackInteger                 SqMod_PopStackInteger;
-    extern SqEx_PopStackFloat                   SqMod_PopStackFloat;
-    extern SqEx_PopStackSLong                   SqMod_PopStackSLong;
-    extern SqEx_PopStackULong                   SqMod_PopStackULong;
+    extern SqModAPI_PopStackInteger                 SqMod_PopStackInteger;
+    extern SqModAPI_PopStackFloat                   SqMod_PopStackFloat;
+    extern SqModAPI_PopStackSLong                   SqMod_PopStackSLong;
+    extern SqModAPI_PopStackULong                   SqMod_PopStackULong;
 
     //buffer utilities
-    extern SqEx_PushBuffer                      SqMod_PushBuffer;
-    extern SqEx_PushBufferData                  SqMod_PushBufferData;
-    extern SqEx_GetBufferInfo                   SqMod_GetBufferInfo;
-    extern SqEx_GetBufferData                   SqMod_GetBufferData;
-    extern SqEx_GetBufferSize                   SqMod_GetBufferSize;
-    extern SqEx_GetBufferCursor                 SqMod_GetBufferCursor;
+    extern SqModAPI_PushBuffer                      SqMod_PushBuffer;
+    extern SqModAPI_PushBufferData                  SqMod_PushBufferData;
+    extern SqModAPI_GetBufferInfo                   SqMod_GetBufferInfo;
+    extern SqModAPI_GetBufferData                   SqMod_GetBufferData;
+    extern SqModAPI_GetBufferSize                   SqMod_GetBufferSize;
+    extern SqModAPI_GetBufferCursor                 SqMod_GetBufferCursor;
 
 #endif // SQMOD_PLUGIN_API
 
     /* --------------------------------------------------------------------------------------------
-     * Import the functions from the main squirrel plug-in.
+     * The structure exported by the host plug-in to import the module and squirrel API.
     */
-    SQUIRREL_API HSQEXPORTS sq_api_import(PluginFuncs * vcapi);
+    typedef struct
+    {
+        unsigned int StructSize;
+        //base functions
+        int32_t (*PopulateModuleAPI) (HSQMODAPI api, size_t size);
+        int32_t (*PopulateSquirrelAPI) (HSQLIBAPI api, size_t size);
+    } sq_modexports, SQMODEXPORTS, *HSQMODEXPORTS;
 
     /* --------------------------------------------------------------------------------------------
      * Assign the functions from the specified API structure into the global functions.
     */
-    SQUIRREL_API SQRESULT sq_api_expand(HSQAPI sqapi);
+    SQUIRREL_API uint8_t sqmod_api_expand(HSQMODAPI sqmodapi);
 
     /* --------------------------------------------------------------------------------------------
      * Assign the functions from the specified API structure into the global functions.
     */
-    SQUIRREL_API SQRESULT sqmod_api_expand(HSQEXPORTS sqmodapi);
-
-    /* --------------------------------------------------------------------------------------------
-     * Undo changes done by sq_api_expand.
-    */
-    SQUIRREL_API void sq_api_collapse();
+    SQUIRREL_API uint8_t sqlib_api_expand(HSQLIBAPI sqlibapi);
 
     /* --------------------------------------------------------------------------------------------
      * Undo changes done by sqmod_api_expand.
     */
     SQUIRREL_API void sqmod_api_collapse();
 
+    /* --------------------------------------------------------------------------------------------
+     * Undo changes done by sq_api_expand.
+    */
+    SQUIRREL_API void sqlib_api_collapse();
+
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
 
-#endif /*_SQ_API_H_*/
+#endif /*_SQ_MOD_H_*/
diff --git a/shared/SqMod.inl b/shared/SqMod.inl
index 12fe7397..3f248421 100644
--- a/shared/SqMod.inl
+++ b/shared/SqMod.inl
@@ -1,675 +1,80 @@
 // ------------------------------------------------------------------------------------------------
 #ifdef SQMOD_PLUGIN_API
 
-//vm
-sqapi_open                          sq_open                         = NULL;
-sqapi_newthread                     sq_newthread                    = NULL;
-sqapi_seterrorhandler               sq_seterrorhandler              = NULL;
-sqapi_close                         sq_close                        = NULL;
-sqapi_setforeignptr                 sq_setforeignptr                = NULL;
-sqapi_getforeignptr                 sq_getforeignptr                = NULL;
-sqapi_setsharedforeignptr           sq_setsharedforeignptr          = NULL;
-sqapi_getsharedforeignptr           sq_getsharedforeignptr          = NULL;
-sqapi_setvmreleasehook              sq_setvmreleasehook             = NULL;
-sqapi_getvmreleasehook              sq_getvmreleasehook             = NULL;
-sqapi_setsharedreleasehook          sq_setsharedreleasehook         = NULL;
-sqapi_getsharedreleasehook          sq_getsharedreleasehook         = NULL;
-sqapi_setprintfunc                  sq_setprintfunc                 = NULL;
-sqapi_getprintfunc                  sq_getprintfunc                 = NULL;
-sqapi_geterrorfunc                  sq_geterrorfunc                 = NULL;
-sqapi_suspendvm                     sq_suspendvm                    = NULL;
-sqapi_wakeupvm                      sq_wakeupvm                     = NULL;
-sqapi_getvmstate                    sq_getvmstate                   = NULL;
-sqapi_getversion                    sq_getversion                   = NULL;
-
-//compiler
-sqapi_compile                       sq_compile                      = NULL;
-sqapi_compilebuffer                 sq_compilebuffer                = NULL;
-sqapi_enabledebuginfo               sq_enabledebuginfo              = NULL;
-sqapi_notifyallexceptions           sq_notifyallexceptions          = NULL;
-sqapi_setcompilererrorhandler       sq_setcompilererrorhandler      = NULL;
-
-//stack operations
-sqapi_push                          sq_push                         = NULL;
-sqapi_pop                           sq_pop                          = NULL;
-sqapi_poptop                        sq_poptop                       = NULL;
-sqapi_remove                        sq_remove                       = NULL;
-sqapi_gettop                        sq_gettop                       = NULL;
-sqapi_settop                        sq_settop                       = NULL;
-sqapi_reservestack                  sq_reservestack                 = NULL;
-sqapi_cmp                           sq_cmp                          = NULL;
-sqapi_move                          sq_move                         = NULL;
-
-//object creation handling
-sqapi_newuserdata                   sq_newuserdata                  = NULL;
-sqapi_newtable                      sq_newtable                     = NULL;
-sqapi_newtableex                    sq_newtableex                   = NULL;
-sqapi_newarray                      sq_newarray                     = NULL;
-sqapi_newclosure                    sq_newclosure                   = NULL;
-sqapi_setparamscheck                sq_setparamscheck               = NULL;
-sqapi_bindenv                       sq_bindenv                      = NULL;
-sqapi_setclosureroot                sq_setclosureroot               = NULL;
-sqapi_getclosureroot                sq_getclosureroot               = NULL;
-sqapi_pushstring                    sq_pushstring                   = NULL;
-sqapi_pushfloat                     sq_pushfloat                    = NULL;
-sqapi_pushinteger                   sq_pushinteger                  = NULL;
-sqapi_pushbool                      sq_pushbool                     = NULL;
-sqapi_pushuserpointer               sq_pushuserpointer              = NULL;
-sqapi_pushnull                      sq_pushnull                     = NULL;
-sqapi_pushthread                    sq_pushthread                   = NULL;
-sqapi_gettype                       sq_gettype                      = NULL;
-sqapi_typeof                        sq_typeof                       = NULL;
-sqapi_getsize                       sq_getsize                      = NULL;
-sqapi_gethash                       sq_gethash                      = NULL;
-sqapi_getbase                       sq_getbase                      = NULL;
-sqapi_instanceof                    sq_instanceof                   = NULL;
-sqapi_tostring                      sq_tostring                     = NULL;
-sqapi_tobool                        sq_tobool                       = NULL;
-sqapi_getstringandsize              sq_getstringandsize             = NULL;
-sqapi_getstring                     sq_getstring                    = NULL;
-sqapi_getinteger                    sq_getinteger                   = NULL;
-sqapi_getfloat                      sq_getfloat                     = NULL;
-sqapi_getbool                       sq_getbool                      = NULL;
-sqapi_getthread                     sq_getthread                    = NULL;
-sqapi_getuserpointer                sq_getuserpointer               = NULL;
-sqapi_getuserdata                   sq_getuserdata                  = NULL;
-sqapi_settypetag                    sq_settypetag                   = NULL;
-sqapi_gettypetag                    sq_gettypetag                   = NULL;
-sqapi_setreleasehook                sq_setreleasehook               = NULL;
-sqapi_getreleasehook                sq_getreleasehook               = NULL;
-sqapi_getscratchpad                 sq_getscratchpad                = NULL;
-sqapi_getfunctioninfo               sq_getfunctioninfo              = NULL;
-sqapi_getclosureinfo                sq_getclosureinfo               = NULL;
-sqapi_getclosurename                sq_getclosurename               = NULL;
-sqapi_setnativeclosurename          sq_setnativeclosurename         = NULL;
-sqapi_setinstanceup                 sq_setinstanceup                = NULL;
-sqapi_getinstanceup                 sq_getinstanceup                = NULL;
-sqapi_setclassudsize                sq_setclassudsize               = NULL;
-sqapi_newclass                      sq_newclass                     = NULL;
-sqapi_createinstance                sq_createinstance               = NULL;
-sqapi_setattributes                 sq_setattributes                = NULL;
-sqapi_getattributes                 sq_getattributes                = NULL;
-sqapi_getclass                      sq_getclass                     = NULL;
-sqapi_weakref                       sq_weakref                      = NULL;
-sqapi_getdefaultdelegate            sq_getdefaultdelegate           = NULL;
-sqapi_getmemberhandle               sq_getmemberhandle              = NULL;
-sqapi_getbyhandle                   sq_getbyhandle                  = NULL;
-sqapi_setbyhandle                   sq_setbyhandle                  = NULL;
-
-//object manipulation
-sqapi_pushroottable                 sq_pushroottable                = NULL;
-sqapi_pushregistrytable             sq_pushregistrytable            = NULL;
-sqapi_pushconsttable                sq_pushconsttable               = NULL;
-sqapi_setroottable                  sq_setroottable                 = NULL;
-sqapi_setconsttable                 sq_setconsttable                = NULL;
-sqapi_newslot                       sq_newslot                      = NULL;
-sqapi_deleteslot                    sq_deleteslot                   = NULL;
-sqapi_set                           sq_set                          = NULL;
-sqapi_get                           sq_get                          = NULL;
-sqapi_rawget                        sq_rawget                       = NULL;
-sqapi_rawset                        sq_rawset                       = NULL;
-sqapi_rawdeleteslot                 sq_rawdeleteslot                = NULL;
-sqapi_newmember                     sq_newmember                    = NULL;
-sqapi_rawnewmember                  sq_rawnewmember                 = NULL;
-sqapi_arrayappend                   sq_arrayappend                  = NULL;
-sqapi_arraypop                      sq_arraypop                     = NULL;
-sqapi_arrayresize                   sq_arrayresize                  = NULL;
-sqapi_arrayreverse                  sq_arrayreverse                 = NULL;
-sqapi_arrayremove                   sq_arrayremove                  = NULL;
-sqapi_arrayinsert                   sq_arrayinsert                  = NULL;
-sqapi_setdelegate                   sq_setdelegate                  = NULL;
-sqapi_getdelegate                   sq_getdelegate                  = NULL;
-sqapi_clone                         sq_clone                        = NULL;
-sqapi_setfreevariable               sq_setfreevariable              = NULL;
-sqapi_next                          sq_next                         = NULL;
-sqapi_getweakrefval                 sq_getweakrefval                = NULL;
-sqapi_clear                         sq_clear                        = NULL;
-
-//calls
-sqapi_call                          sq_call                         = NULL;
-sqapi_resume                        sq_resume                       = NULL;
-sqapi_getlocal                      sq_getlocal                     = NULL;
-sqapi_getcallee                     sq_getcallee                    = NULL;
-sqapi_getfreevariable               sq_getfreevariable              = NULL;
-sqapi_throwerror                    sq_throwerror                   = NULL;
-sqapi_throwobject                   sq_throwobject                  = NULL;
-sqapi_reseterror                    sq_reseterror                   = NULL;
-sqapi_getlasterror                  sq_getlasterror                 = NULL;
-
-//raw object handling
-sqapi_getstackobj                   sq_getstackobj                  = NULL;
-sqapi_pushobject                    sq_pushobject                   = NULL;
-sqapi_addref                        sq_addref                       = NULL;
-sqapi_release                       sq_release                      = NULL;
-sqapi_getrefcount                   sq_getrefcount                  = NULL;
-sqapi_resetobject                   sq_resetobject                  = NULL;
-sqapi_objtostring                   sq_objtostring                  = NULL;
-sqapi_objtobool                     sq_objtobool                    = NULL;
-sqapi_objtointeger                  sq_objtointeger                 = NULL;
-sqapi_objtofloat                    sq_objtofloat                   = NULL;
-sqapi_objtouserpointer              sq_objtouserpointer             = NULL;
-sqapi_getobjtypetag                 sq_getobjtypetag                = NULL;
-sqapi_getvmrefcount                 sq_getvmrefcount                = NULL;
-
-//GC
-sqapi_collectgarbage                sq_collectgarbage               = NULL;
-sqapi_resurrectunreachable          sq_resurrectunreachable         = NULL;
-
-//serialization
-sqapi_writeclosure                  sq_writeclosure                 = NULL;
-sqapi_readclosure                   sq_readclosure                  = NULL;
-
-//mem allocation
-sqapi_malloc                        sq_malloc                       = NULL;
-sqapi_realloc                       sq_realloc                      = NULL;
-sqapi_free                          sq_free                         = NULL;
-
-//debug
-sqapi_stackinfos                    sq_stackinfos                   = NULL;
-sqapi_setdebughook                  sq_setdebughook                 = NULL;
-sqapi_setnativedebughook            sq_setnativedebughook           = NULL;
-
-//compiler helpers
-sqapi_loadfile                      sqstd_loadfile                  = NULL;
-sqapi_dofile                        sqstd_dofile                    = NULL;
-sqapi_writeclosuretofile            sqstd_writeclosuretofile        = NULL;
-
-//blob
-sqapi_createblob                    sqstd_createblob                = NULL;
-sqapi_getblob                       sqstd_getblob                   = NULL;
-sqapi_getblobsize                   sqstd_getblobsize               = NULL;
-
-//string
-sqapi_format                        sqstd_format                    = NULL;
-
-#endif // SQMOD_PLUGIN_API
-
-// ------------------------------------------------------------------------------------------------
-HSQEXPORTS sq_api_import(PluginFuncs * vcapi)
-{
-    // Make sure a valid plug-in api and reference to exports structure pointer was specified
-    if (!vcapi)
-    {
-        return NULL;
-    }
-    size_t struct_size;
-    // Attempt to find the main plug-in ID
-    int plugin_id = vcapi->FindPlugin((char *)(SQMOD_HOST_NAME));
-    // Attempt to retrieve the plug-in exports
-    const void ** plugin_exports = vcapi->GetPluginExports(plugin_id, &struct_size);
-    // See if we have any imports from Squirrel
-    if (plugin_exports == NULL || struct_size <= 0)
-    {
-        return NULL;
-    }
-    // Simply return the obtain poiner to the exports structure
-    return *(sq_exports **)plugin_exports;
-}
-
-// ------------------------------------------------------------------------------------------------
-SQRESULT sq_api_expand(HSQAPI sqapi)
-{
-    if (!sqapi)
-    {
-        return SQ_ERROR;
-    }
-
-#ifdef SQMOD_PLUGIN_API
-
-    //vm
-    sq_open                         = sqapi->open;
-    sq_newthread                    = sqapi->newthread;
-    sq_seterrorhandler              = sqapi->seterrorhandler;
-    sq_close                        = sqapi->close;
-    sq_setforeignptr                = sqapi->setforeignptr;
-    sq_getforeignptr                = sqapi->getforeignptr;
-    sq_setsharedforeignptr          = sqapi->setsharedforeignptr;
-    sq_getsharedforeignptr          = sqapi->getsharedforeignptr;
-    sq_setvmreleasehook             = sqapi->setvmreleasehook;
-    sq_getvmreleasehook             = sqapi->getvmreleasehook;
-    sq_setsharedreleasehook         = sqapi->setsharedreleasehook;
-    sq_getsharedreleasehook         = sqapi->getsharedreleasehook;
-    sq_setprintfunc                 = sqapi->setprintfunc;
-    sq_getprintfunc                 = sqapi->getprintfunc;
-    sq_geterrorfunc                 = sqapi->geterrorfunc;
-    sq_suspendvm                    = sqapi->suspendvm;
-    sq_wakeupvm                     = sqapi->wakeupvm;
-    sq_getvmstate                   = sqapi->getvmstate;
-    sq_getversion                   = sqapi->getversion;
-
-    //compiler
-    sq_compile                      = sqapi->compile;
-    sq_compilebuffer                = sqapi->compilebuffer;
-    sq_enabledebuginfo              = sqapi->enabledebuginfo;
-    sq_notifyallexceptions          = sqapi->notifyallexceptions;
-    sq_setcompilererrorhandler      = sqapi->setcompilererrorhandler;
-
-    //stack operations
-    sq_push                         = sqapi->push;
-    sq_pop                          = sqapi->pop;
-    sq_poptop                       = sqapi->poptop;
-    sq_remove                       = sqapi->remove;
-    sq_gettop                       = sqapi->gettop;
-    sq_settop                       = sqapi->settop;
-    sq_reservestack                 = sqapi->reservestack;
-    sq_cmp                          = sqapi->cmp;
-    sq_move                         = sqapi->move;
-
-    //object creation handling
-    sq_newuserdata                  = sqapi->newuserdata;
-    sq_newtable                     = sqapi->newtable;
-    sq_newtableex                   = sqapi->newtableex;
-    sq_newarray                     = sqapi->newarray;
-    sq_newclosure                   = sqapi->newclosure;
-    sq_setparamscheck               = sqapi->setparamscheck;
-    sq_bindenv                      = sqapi->bindenv;
-    sq_setclosureroot               = sqapi->setclosureroot;
-    sq_getclosureroot               = sqapi->getclosureroot;
-    sq_pushstring                   = sqapi->pushstring;
-    sq_pushfloat                    = sqapi->pushfloat;
-    sq_pushinteger                  = sqapi->pushinteger;
-    sq_pushbool                     = sqapi->pushbool;
-    sq_pushuserpointer              = sqapi->pushuserpointer;
-    sq_pushnull                     = sqapi->pushnull;
-    sq_pushthread                   = sqapi->pushthread;
-    sq_gettype                      = sqapi->gettype;
-    sq_typeof                       = sqapi->typeof_;
-    sq_getsize                      = sqapi->getsize;
-    sq_gethash                      = sqapi->gethash;
-    sq_getbase                      = sqapi->getbase;
-    sq_instanceof                   = sqapi->instanceof;
-    sq_tostring                     = sqapi->tostring;
-    sq_tobool                       = sqapi->tobool;
-    sq_getstringandsize             = sqapi->getstringandsize;
-    sq_getstring                    = sqapi->getstring;
-    sq_getinteger                   = sqapi->getinteger;
-    sq_getfloat                     = sqapi->getfloat;
-    sq_getbool                      = sqapi->getbool;
-    sq_getthread                    = sqapi->getthread;
-    sq_getuserpointer               = sqapi->getuserpointer;
-    sq_getuserdata                  = sqapi->getuserdata;
-    sq_settypetag                   = sqapi->settypetag;
-    sq_gettypetag                   = sqapi->gettypetag;
-    sq_setreleasehook               = sqapi->setreleasehook;
-    sq_getreleasehook               = sqapi->getreleasehook;
-    sq_getscratchpad                = sqapi->getscratchpad;
-    sq_getfunctioninfo              = sqapi->getfunctioninfo;
-    sq_getclosureinfo               = sqapi->getclosureinfo;
-    sq_getclosurename               = sqapi->getclosurename;
-    sq_setnativeclosurename         = sqapi->setnativeclosurename;
-    sq_setinstanceup                = sqapi->setinstanceup;
-    sq_getinstanceup                = sqapi->getinstanceup;
-    sq_setclassudsize               = sqapi->setclassudsize;
-    sq_newclass                     = sqapi->newclass;
-    sq_createinstance               = sqapi->createinstance;
-    sq_setattributes                = sqapi->setattributes;
-    sq_getattributes                = sqapi->getattributes;
-    sq_getclass                     = sqapi->getclass;
-    sq_weakref                      = sqapi->weakref;
-    sq_getdefaultdelegate           = sqapi->getdefaultdelegate;
-    sq_getmemberhandle              = sqapi->getmemberhandle;
-    sq_getbyhandle                  = sqapi->getbyhandle;
-    sq_setbyhandle                  = sqapi->setbyhandle;
-
-    //object manipulation
-    sq_pushroottable                = sqapi->pushroottable;
-    sq_pushregistrytable            = sqapi->pushregistrytable;
-    sq_pushconsttable               = sqapi->pushconsttable;
-    sq_setroottable                 = sqapi->setroottable;
-    sq_setconsttable                = sqapi->setconsttable;
-    sq_newslot                      = sqapi->newslot;
-    sq_deleteslot                   = sqapi->deleteslot;
-    sq_set                          = sqapi->set;
-    sq_get                          = sqapi->get;
-    sq_rawget                       = sqapi->rawget;
-    sq_rawset                       = sqapi->rawset;
-    sq_rawdeleteslot                = sqapi->rawdeleteslot;
-    sq_newmember                    = sqapi->newmember;
-    sq_rawnewmember                 = sqapi->rawnewmember;
-    sq_arrayappend                  = sqapi->arrayappend;
-    sq_arraypop                     = sqapi->arraypop;
-    sq_arrayresize                  = sqapi->arrayresize;
-    sq_arrayreverse                 = sqapi->arrayreverse;
-    sq_arrayremove                  = sqapi->arrayremove;
-    sq_arrayinsert                  = sqapi->arrayinsert;
-    sq_setdelegate                  = sqapi->setdelegate;
-    sq_getdelegate                  = sqapi->getdelegate;
-    sq_clone                        = sqapi->clone;
-    sq_setfreevariable              = sqapi->setfreevariable;
-    sq_next                         = sqapi->next;
-    sq_getweakrefval                = sqapi->getweakrefval;
-    sq_clear                        = sqapi->clear;
-
-    //calls
-    sq_call                         = sqapi->call;
-    sq_resume                       = sqapi->resume;
-    sq_getlocal                     = sqapi->getlocal;
-    sq_getcallee                    = sqapi->getcallee;
-    sq_getfreevariable              = sqapi->getfreevariable;
-    sq_throwerror                   = sqapi->throwerror;
-    sq_throwobject                  = sqapi->throwobject;
-    sq_reseterror                   = sqapi->reseterror;
-    sq_getlasterror                 = sqapi->getlasterror;
-
-    //raw object handling
-    sq_getstackobj                  = sqapi->getstackobj;
-    sq_pushobject                   = sqapi->pushobject;
-    sq_addref                       = sqapi->addref;
-    sq_release                      = sqapi->release;
-    sq_getrefcount                  = sqapi->getrefcount;
-    sq_resetobject                  = sqapi->resetobject;
-    sq_objtostring                  = sqapi->objtostring;
-    sq_objtobool                    = sqapi->objtobool;
-    sq_objtointeger                 = sqapi->objtointeger;
-    sq_objtofloat                   = sqapi->objtofloat;
-    sq_objtouserpointer             = sqapi->objtouserpointer;
-    sq_getobjtypetag                = sqapi->getobjtypetag;
-    sq_getvmrefcount                = sqapi->getvmrefcount;
-
-    //GC
-    sq_collectgarbage               = sqapi->collectgarbage;
-    sq_resurrectunreachable         = sqapi->resurrectunreachable;
-
-    //serialization
-    sq_writeclosure                 = sqapi->writeclosure;
-    sq_readclosure                  = sqapi->readclosure;
-
-    //mem allocation
-    sq_malloc                       = sqapi->malloc;
-    sq_realloc                      = sqapi->realloc;
-    sq_free                         = sqapi->free;
-
-    //debug
-    sq_stackinfos                   = sqapi->stackinfos;
-    sq_setdebughook                 = sqapi->setdebughook;
-    sq_setnativedebughook           = sqapi->setnativedebughook;
-
-    //compiler helpers
-    sqstd_loadfile                  = sqapi->loadfile;
-    sqstd_dofile                    = sqapi->dofile;
-    sqstd_writeclosuretofile        = sqapi->writeclosuretofile;
-
-    //blob
-    sqstd_createblob                = sqapi->createblob;
-    sqstd_getblob                   = sqapi->getblob;
-    sqstd_getblobsize               = sqapi->getblobsize;
-
-    //string
-    sqstd_format                    = sqapi->format;
-
-#endif // SQMOD_PLUGIN_API
-
-    return SQ_OK;
-}
-
-// ------------------------------------------------------------------------------------------------
-void sq_api_collapse()
-{
-#ifdef SQMOD_PLUGIN_API
-
-    //vm
-    sq_open                         = NULL;
-    sq_newthread                    = NULL;
-    sq_seterrorhandler              = NULL;
-    sq_close                        = NULL;
-    sq_setforeignptr                = NULL;
-    sq_getforeignptr                = NULL;
-    sq_setsharedforeignptr          = NULL;
-    sq_getsharedforeignptr          = NULL;
-    sq_setvmreleasehook             = NULL;
-    sq_getvmreleasehook             = NULL;
-    sq_setsharedreleasehook         = NULL;
-    sq_getsharedreleasehook         = NULL;
-    sq_setprintfunc                 = NULL;
-    sq_getprintfunc                 = NULL;
-    sq_geterrorfunc                 = NULL;
-    sq_suspendvm                    = NULL;
-    sq_wakeupvm                     = NULL;
-    sq_getvmstate                   = NULL;
-    sq_getversion                   = NULL;
-
-    //compiler
-    sq_compile                      = NULL;
-    sq_compilebuffer                = NULL;
-    sq_enabledebuginfo              = NULL;
-    sq_notifyallexceptions          = NULL;
-    sq_setcompilererrorhandler      = NULL;
-
-    //stack operations
-    sq_push                         = NULL;
-    sq_pop                          = NULL;
-    sq_poptop                       = NULL;
-    sq_remove                       = NULL;
-    sq_gettop                       = NULL;
-    sq_settop                       = NULL;
-    sq_reservestack                 = NULL;
-    sq_cmp                          = NULL;
-    sq_move                         = NULL;
-
-    //object creation handling
-    sq_newuserdata                  = NULL;
-    sq_newtable                     = NULL;
-    sq_newtableex                   = NULL;
-    sq_newarray                     = NULL;
-    sq_newclosure                   = NULL;
-    sq_setparamscheck               = NULL;
-    sq_bindenv                      = NULL;
-    sq_setclosureroot               = NULL;
-    sq_getclosureroot               = NULL;
-    sq_pushstring                   = NULL;
-    sq_pushfloat                    = NULL;
-    sq_pushinteger                  = NULL;
-    sq_pushbool                     = NULL;
-    sq_pushuserpointer              = NULL;
-    sq_pushnull                     = NULL;
-    sq_pushthread                   = NULL;
-    sq_gettype                      = NULL;
-    sq_typeof                       = NULL;
-    sq_getsize                      = NULL;
-    sq_gethash                      = NULL;
-    sq_getbase                      = NULL;
-    sq_instanceof                   = NULL;
-    sq_tostring                     = NULL;
-    sq_tobool                       = NULL;
-    sq_getstringandsize             = NULL;
-    sq_getstring                    = NULL;
-    sq_getinteger                   = NULL;
-    sq_getfloat                     = NULL;
-    sq_getbool                      = NULL;
-    sq_getthread                    = NULL;
-    sq_getuserpointer               = NULL;
-    sq_getuserdata                  = NULL;
-    sq_settypetag                   = NULL;
-    sq_gettypetag                   = NULL;
-    sq_setreleasehook               = NULL;
-    sq_getreleasehook               = NULL;
-    sq_getscratchpad                = NULL;
-    sq_getfunctioninfo              = NULL;
-    sq_getclosureinfo               = NULL;
-    sq_getclosurename               = NULL;
-    sq_setnativeclosurename         = NULL;
-    sq_setinstanceup                = NULL;
-    sq_getinstanceup                = NULL;
-    sq_setclassudsize               = NULL;
-    sq_newclass                     = NULL;
-    sq_createinstance               = NULL;
-    sq_setattributes                = NULL;
-    sq_getattributes                = NULL;
-    sq_getclass                     = NULL;
-    sq_weakref                      = NULL;
-    sq_getdefaultdelegate           = NULL;
-    sq_getmemberhandle              = NULL;
-    sq_getbyhandle                  = NULL;
-    sq_setbyhandle                  = NULL;
-
-    //object manipulation
-    sq_pushroottable                = NULL;
-    sq_pushregistrytable            = NULL;
-    sq_pushconsttable               = NULL;
-    sq_setroottable                 = NULL;
-    sq_setconsttable                = NULL;
-    sq_newslot                      = NULL;
-    sq_deleteslot                   = NULL;
-    sq_set                          = NULL;
-    sq_get                          = NULL;
-    sq_rawget                       = NULL;
-    sq_rawset                       = NULL;
-    sq_rawdeleteslot                = NULL;
-    sq_newmember                    = NULL;
-    sq_rawnewmember                 = NULL;
-    sq_arrayappend                  = NULL;
-    sq_arraypop                     = NULL;
-    sq_arrayresize                  = NULL;
-    sq_arrayreverse                 = NULL;
-    sq_arrayremove                  = NULL;
-    sq_arrayinsert                  = NULL;
-    sq_setdelegate                  = NULL;
-    sq_getdelegate                  = NULL;
-    sq_clone                        = NULL;
-    sq_setfreevariable              = NULL;
-    sq_next                         = NULL;
-    sq_getweakrefval                = NULL;
-    sq_clear                        = NULL;
-
-    //calls
-    sq_call                         = NULL;
-    sq_resume                       = NULL;
-    sq_getlocal                     = NULL;
-    sq_getcallee                    = NULL;
-    sq_getfreevariable              = NULL;
-    sq_throwerror                   = NULL;
-    sq_throwobject                  = NULL;
-    sq_reseterror                   = NULL;
-    sq_getlasterror                 = NULL;
-
-    //raw object handling
-    sq_getstackobj                  = NULL;
-    sq_pushobject                   = NULL;
-    sq_addref                       = NULL;
-    sq_release                      = NULL;
-    sq_getrefcount                  = NULL;
-    sq_resetobject                  = NULL;
-    sq_objtostring                  = NULL;
-    sq_objtobool                    = NULL;
-    sq_objtointeger                 = NULL;
-    sq_objtofloat                   = NULL;
-    sq_objtouserpointer             = NULL;
-    sq_getobjtypetag                = NULL;
-    sq_getvmrefcount                = NULL;
-
-    //GC
-    sq_collectgarbage               = NULL;
-    sq_resurrectunreachable         = NULL;
-
-    //serialization
-    sq_writeclosure                 = NULL;
-    sq_readclosure                  = NULL;
-
-    //mem allocation
-    sq_malloc                       = NULL;
-    sq_realloc                      = NULL;
-    sq_free                         = NULL;
-
-    //debug
-    sq_stackinfos                   = NULL;
-    sq_setdebughook                 = NULL;
-    sq_setnativedebughook           = NULL;
-
-    //compiler helpers
-    sqstd_loadfile                  = NULL;
-    sqstd_dofile                    = NULL;
-    sqstd_writeclosuretofile        = NULL;
-
-    //blob
-    sqstd_createblob                = NULL;
-    sqstd_getblob                   = NULL;
-    sqstd_getblobsize               = NULL;
-
-    //string
-    sqstd_format                    = NULL;
-
-#endif // SQMOD_PLUGIN_API
-}
-
-// ------------------------------------------------------------------------------------------------
-#ifdef SQMOD_PLUGIN_API
-
 //primitive functions
-SqEx_GetSquirrelAPI                     SqMod_GetSquirrelAPI                        = NULL;
-SqEx_GetSquirrelVM                      SqMod_GetSquirrelVM                         = NULL;
+SqModAPI_GetSquirrelVM                      SqMod_GetSquirrelVM                         = NULL;
 
 //logging utilities
-SqEx_LogMessage                         SqMod_LogDbg                                = NULL;
-SqEx_LogMessage                         SqMod_LogUsr                                = NULL;
-SqEx_LogMessage                         SqMod_LogScs                                = NULL;
-SqEx_LogMessage                         SqMod_LogInf                                = NULL;
-SqEx_LogMessage                         SqMod_LogWrn                                = NULL;
-SqEx_LogMessage                         SqMod_LogErr                                = NULL;
-SqEx_LogMessage                         SqMod_LogFtl                                = NULL;
-SqEx_LogMessage                         SqMod_LogSDbg                               = NULL;
-SqEx_LogMessage                         SqMod_LogSUsr                               = NULL;
-SqEx_LogMessage                         SqMod_LogSScs                               = NULL;
-SqEx_LogMessage                         SqMod_LogSInf                               = NULL;
-SqEx_LogMessage                         SqMod_LogSWrn                               = NULL;
-SqEx_LogMessage                         SqMod_LogSErr                               = NULL;
-SqEx_LogMessage                         SqMod_LogSFtl                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogDbg                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogUsr                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogScs                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogInf                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogWrn                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogErr                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogFtl                                = NULL;
+SqModAPI_LogMessage                         SqMod_LogSDbg                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogSUsr                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogSScs                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogSInf                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogSWrn                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogSErr                               = NULL;
+SqModAPI_LogMessage                         SqMod_LogSFtl                               = NULL;
 
 //script loading
-SqEx_LoadScript                         SqMod_LoadScript                            = NULL;
+SqModAPI_LoadScript                         SqMod_LoadScript                            = NULL;
 
 //numeric utilities
-SqEx_GetSLongValue                      SqMod_GetSLongValue                         = NULL;
-SqEx_PushSLongObject                    SqMod_PushSLongObject                       = NULL;
-SqEx_GetULongValue                      SqMod_GetULongValue                         = NULL;
-SqEx_PushULongObject                    SqMod_PushULongObject                       = NULL;
+SqModAPI_GetSLongValue                      SqMod_GetSLongValue                         = NULL;
+SqModAPI_PushSLongObject                    SqMod_PushSLongObject                       = NULL;
+SqModAPI_GetULongValue                      SqMod_GetULongValue                         = NULL;
+SqModAPI_PushULongObject                    SqMod_PushULongObject                       = NULL;
 
 //time utilities
-SqEx_GetCurrentSysTime                  SqMod_GetCurrentSysTime                     = NULL;
-SqEx_GetEpochTimeMicro                  SqMod_GetEpochTimeMicro                     = NULL;
-SqEx_GetEpochTimeMilli                  SqMod_GetEpochTimeMilli                     = NULL;
-SqEx_ValidDate                          SqMod_ValidDate                             = NULL;
-SqEx_IsLeapYear                         SqMod_IsLeapYear                            = NULL;
-SqEx_DaysInYear                         SqMod_DaysInYear                            = NULL;
-SqEx_DaysInMonth                        SqMod_DaysInMonth                           = NULL;
-SqEx_DayOfYear                          SqMod_DayOfYear                             = NULL;
-SqEx_DateRangeToSeconds                 SqMod_DateRangeToSeconds                    = NULL;
-SqEx_GetTimestamp                       SqMod_GetTimestamp                          = NULL;
-SqEx_PushTimestamp                      SqMod_PushTimestamp                         = NULL;
-SqEx_GetDate                            SqMod_GetDate                               = NULL;
-SqEx_PushDate                           SqMod_PushDate                              = NULL;
-SqEx_GetTime                            SqMod_GetTime                               = NULL;
-SqEx_PushTime                           SqMod_PushTime                              = NULL;
-SqEx_GetDatetime                        SqMod_GetDatetime                           = NULL;
-SqEx_PushDatetime                       SqMod_PushDatetime                          = NULL;
+SqModAPI_GetCurrentSysTime                  SqMod_GetCurrentSysTime                     = NULL;
+SqModAPI_GetEpochTimeMicro                  SqMod_GetEpochTimeMicro                     = NULL;
+SqModAPI_GetEpochTimeMilli                  SqMod_GetEpochTimeMilli                     = NULL;
+SqModAPI_ValidDate                          SqMod_ValidDate                             = NULL;
+SqModAPI_IsLeapYear                         SqMod_IsLeapYear                            = NULL;
+SqModAPI_DaysInYear                         SqMod_DaysInYear                            = NULL;
+SqModAPI_DaysInMonth                        SqMod_DaysInMonth                           = NULL;
+SqModAPI_DayOfYear                          SqMod_DayOfYear                             = NULL;
+SqModAPI_DateRangeToSeconds                 SqMod_DateRangeToSeconds                    = NULL;
+SqModAPI_GetTimestamp                       SqMod_GetTimestamp                          = NULL;
+SqModAPI_PushTimestamp                      SqMod_PushTimestamp                         = NULL;
+SqModAPI_GetDate                            SqMod_GetDate                               = NULL;
+SqModAPI_PushDate                           SqMod_PushDate                              = NULL;
+SqModAPI_GetTime                            SqMod_GetTime                               = NULL;
+SqModAPI_PushTime                           SqMod_PushTime                              = NULL;
+SqModAPI_GetDatetime                        SqMod_GetDatetime                           = NULL;
+SqModAPI_PushDatetime                       SqMod_PushDatetime                          = NULL;
 
 //stack utilities
-SqEx_PopStackInteger                    SqMod_PopStackInteger                       = NULL;
-SqEx_PopStackFloat                      SqMod_PopStackFloat                         = NULL;
-SqEx_PopStackSLong                      SqMod_PopStackSLong                         = NULL;
-SqEx_PopStackULong                      SqMod_PopStackULong                         = NULL;
+SqModAPI_PopStackInteger                    SqMod_PopStackInteger                       = NULL;
+SqModAPI_PopStackFloat                      SqMod_PopStackFloat                         = NULL;
+SqModAPI_PopStackSLong                      SqMod_PopStackSLong                         = NULL;
+SqModAPI_PopStackULong                      SqMod_PopStackULong                         = NULL;
 
 //buffer utilities
-SqEx_PushBuffer                         SqMod_PushBuffer                            = NULL;
-SqEx_PushBufferData                     SqMod_PushBufferData                        = NULL;
-SqEx_GetBufferInfo                      SqMod_GetBufferInfo                         = NULL;
-SqEx_GetBufferData                      SqMod_GetBufferData                         = NULL;
-SqEx_GetBufferSize                      SqMod_GetBufferSize                         = NULL;
-SqEx_GetBufferCursor                    SqMod_GetBufferCursor                       = NULL;
+SqModAPI_PushBuffer                         SqMod_PushBuffer                            = NULL;
+SqModAPI_PushBufferData                     SqMod_PushBufferData                        = NULL;
+SqModAPI_GetBufferInfo                      SqMod_GetBufferInfo                         = NULL;
+SqModAPI_GetBufferData                      SqMod_GetBufferData                         = NULL;
+SqModAPI_GetBufferSize                      SqMod_GetBufferSize                         = NULL;
+SqModAPI_GetBufferCursor                    SqMod_GetBufferCursor                       = NULL;
 
 #endif // SQMOD_PLUGIN_API
 
 // ------------------------------------------------------------------------------------------------
-SQRESULT sqmod_api_expand(HSQEXPORTS sqmodapi)
+uint8_t sqmod_api_expand(HSQMODAPI sqmodapi)
 {
     if (!sqmodapi)
     {
-        return SQ_ERROR;
+        return 0;
     }
 
 #ifdef SQMOD_PLUGIN_API
 
     //primitive functions
-    SqMod_GetSquirrelAPI                        = sqmodapi->GetSquirrelAPI;
     SqMod_GetSquirrelVM                         = sqmodapi->GetSquirrelVM;
 
     //logging utilities
@@ -732,7 +137,7 @@ SQRESULT sqmod_api_expand(HSQEXPORTS sqmodapi)
 
 #endif // SQMOD_PLUGIN_API
 
-    return SQ_OK;
+    return 1;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -741,7 +146,6 @@ void sqmod_api_collapse()
 #ifdef SQMOD_PLUGIN_API
 
     //primitive functions
-    SqMod_GetSquirrelAPI                        = NULL;
     SqMod_GetSquirrelVM                         = NULL;
 
     //logging utilities
@@ -804,3 +208,573 @@ void sqmod_api_collapse()
 
 #endif // SQMOD_PLUGIN_API
 }
+
+// ------------------------------------------------------------------------------------------------
+#ifdef SQMOD_PLUGIN_API
+
+//vm
+SqLibAPI_open                               SqLib_open                                  = NULL;
+SqLibAPI_newthread                          SqLib_newthread                             = NULL;
+SqLibAPI_seterrorhandler                    SqLib_seterrorhandler                       = NULL;
+SqLibAPI_close                              SqLib_close                                 = NULL;
+SqLibAPI_setforeignptr                      SqLib_setforeignptr                         = NULL;
+SqLibAPI_getforeignptr                      SqLib_getforeignptr                         = NULL;
+SqLibAPI_setsharedforeignptr                SqLib_setsharedforeignptr                   = NULL;
+SqLibAPI_getsharedforeignptr                SqLib_getsharedforeignptr                   = NULL;
+SqLibAPI_setvmreleasehook                   SqLib_setvmreleasehook                      = NULL;
+SqLibAPI_getvmreleasehook                   SqLib_getvmreleasehook                      = NULL;
+SqLibAPI_setsharedreleasehook               SqLib_setsharedreleasehook                  = NULL;
+SqLibAPI_getsharedreleasehook               SqLib_getsharedreleasehook                  = NULL;
+SqLibAPI_setprintfunc                       SqLib_setprintfunc                          = NULL;
+SqLibAPI_getprintfunc                       SqLib_getprintfunc                          = NULL;
+SqLibAPI_geterrorfunc                       SqLib_geterrorfunc                          = NULL;
+SqLibAPI_suspendvm                          SqLib_suspendvm                             = NULL;
+SqLibAPI_wakeupvm                           SqLib_wakeupvm                              = NULL;
+SqLibAPI_getvmstate                         SqLib_getvmstate                            = NULL;
+SqLibAPI_getversion                         SqLib_getversion                            = NULL;
+
+//compiler
+SqLibAPI_compile                            SqLib_compile                               = NULL;
+SqLibAPI_compilebuffer                      SqLib_compilebuffer                         = NULL;
+SqLibAPI_enabledebuginfo                    SqLib_enabledebuginfo                       = NULL;
+SqLibAPI_notifyallexceptions                SqLib_notifyallexceptions                   = NULL;
+SqLibAPI_setcompilererrorhandler            SqLib_setcompilererrorhandler               = NULL;
+
+//stack operations
+SqLibAPI_push                               SqLib_push                                  = NULL;
+SqLibAPI_pop                                SqLib_pop                                   = NULL;
+SqLibAPI_poptop                             SqLib_poptop                                = NULL;
+SqLibAPI_remove                             SqLib_remove                                = NULL;
+SqLibAPI_gettop                             SqLib_gettop                                = NULL;
+SqLibAPI_settop                             SqLib_settop                                = NULL;
+SqLibAPI_reservestack                       SqLib_reservestack                          = NULL;
+SqLibAPI_cmp                                SqLib_cmp                                   = NULL;
+SqLibAPI_move                               SqLib_move                                  = NULL;
+
+//object creation handling
+SqLibAPI_newuserdata                        SqLib_newuserdata                           = NULL;
+SqLibAPI_newtable                           SqLib_newtable                              = NULL;
+SqLibAPI_newtableex                         SqLib_newtableex                            = NULL;
+SqLibAPI_newarray                           SqLib_newarray                              = NULL;
+SqLibAPI_newclosure                         SqLib_newclosure                            = NULL;
+SqLibAPI_setparamscheck                     SqLib_setparamscheck                        = NULL;
+SqLibAPI_bindenv                            SqLib_bindenv                               = NULL;
+SqLibAPI_setclosureroot                     SqLib_setclosureroot                        = NULL;
+SqLibAPI_getclosureroot                     SqLib_getclosureroot                        = NULL;
+SqLibAPI_pushstring                         SqLib_pushstring                            = NULL;
+SqLibAPI_pushfloat                          SqLib_pushfloat                             = NULL;
+SqLibAPI_pushinteger                        SqLib_pushinteger                           = NULL;
+SqLibAPI_pushbool                           SqLib_pushbool                              = NULL;
+SqLibAPI_pushuserpointer                    SqLib_pushuserpointer                       = NULL;
+SqLibAPI_pushnull                           SqLib_pushnull                              = NULL;
+SqLibAPI_pushthread                         SqLib_pushthread                            = NULL;
+SqLibAPI_gettype                            SqLib_gettype                               = NULL;
+SqLibAPI_typeof                             SqLib_typeof                                = NULL;
+SqLibAPI_getsize                            SqLib_getsize                               = NULL;
+SqLibAPI_gethash                            SqLib_gethash                               = NULL;
+SqLibAPI_getbase                            SqLib_getbase                               = NULL;
+SqLibAPI_instanceof                         SqLib_instanceof                            = NULL;
+SqLibAPI_tostring                           SqLib_tostring                              = NULL;
+SqLibAPI_tobool                             SqLib_tobool                                = NULL;
+SqLibAPI_getstringandsize                   SqLib_getstringandsize                      = NULL;
+SqLibAPI_getstring                          SqLib_getstring                             = NULL;
+SqLibAPI_getinteger                         SqLib_getinteger                            = NULL;
+SqLibAPI_getfloat                           SqLib_getfloat                              = NULL;
+SqLibAPI_getbool                            SqLib_getbool                               = NULL;
+SqLibAPI_getthread                          SqLib_getthread                             = NULL;
+SqLibAPI_getuserpointer                     SqLib_getuserpointer                        = NULL;
+SqLibAPI_getuserdata                        SqLib_getuserdata                           = NULL;
+SqLibAPI_settypetag                         SqLib_settypetag                            = NULL;
+SqLibAPI_gettypetag                         SqLib_gettypetag                            = NULL;
+SqLibAPI_setreleasehook                     SqLib_setreleasehook                        = NULL;
+SqLibAPI_getreleasehook                     SqLib_getreleasehook                        = NULL;
+SqLibAPI_getscratchpad                      SqLib_getscratchpad                         = NULL;
+SqLibAPI_getfunctioninfo                    SqLib_getfunctioninfo                       = NULL;
+SqLibAPI_getclosureinfo                     SqLib_getclosureinfo                        = NULL;
+SqLibAPI_getclosurename                     SqLib_getclosurename                        = NULL;
+SqLibAPI_setnativeclosurename               SqLib_setnativeclosurename                  = NULL;
+SqLibAPI_setinstanceup                      SqLib_setinstanceup                         = NULL;
+SqLibAPI_getinstanceup                      SqLib_getinstanceup                         = NULL;
+SqLibAPI_setclassudsize                     SqLib_setclassudsize                        = NULL;
+SqLibAPI_newclass                           SqLib_newclass                              = NULL;
+SqLibAPI_createinstance                     SqLib_createinstance                        = NULL;
+SqLibAPI_setattributes                      SqLib_setattributes                         = NULL;
+SqLibAPI_getattributes                      SqLib_getattributes                         = NULL;
+SqLibAPI_getclass                           SqLib_getclass                              = NULL;
+SqLibAPI_weakref                            SqLib_weakref                               = NULL;
+SqLibAPI_getdefaultdelegate                 SqLib_getdefaultdelegate                    = NULL;
+SqLibAPI_getmemberhandle                    SqLib_getmemberhandle                       = NULL;
+SqLibAPI_getbyhandle                        SqLib_getbyhandle                           = NULL;
+SqLibAPI_setbyhandle                        SqLib_setbyhandle                           = NULL;
+
+//object manipulation
+SqLibAPI_pushroottable                      SqLib_pushroottable                         = NULL;
+SqLibAPI_pushregistrytable                  SqLib_pushregistrytable                     = NULL;
+SqLibAPI_pushconsttable                     SqLib_pushconsttable                        = NULL;
+SqLibAPI_setroottable                       SqLib_setroottable                          = NULL;
+SqLibAPI_setconsttable                      SqLib_setconsttable                         = NULL;
+SqLibAPI_newslot                            SqLib_newslot                               = NULL;
+SqLibAPI_deleteslot                         SqLib_deleteslot                            = NULL;
+SqLibAPI_set                                SqLib_set                                   = NULL;
+SqLibAPI_get                                SqLib_get                                   = NULL;
+SqLibAPI_rawget                             SqLib_rawget                                = NULL;
+SqLibAPI_rawset                             SqLib_rawset                                = NULL;
+SqLibAPI_rawdeleteslot                      SqLib_rawdeleteslot                         = NULL;
+SqLibAPI_newmember                          SqLib_newmember                             = NULL;
+SqLibAPI_rawnewmember                       SqLib_rawnewmember                          = NULL;
+SqLibAPI_arrayappend                        SqLib_arrayappend                           = NULL;
+SqLibAPI_arraypop                           SqLib_arraypop                              = NULL;
+SqLibAPI_arrayresize                        SqLib_arrayresize                           = NULL;
+SqLibAPI_arrayreverse                       SqLib_arrayreverse                          = NULL;
+SqLibAPI_arrayremove                        SqLib_arrayremove                           = NULL;
+SqLibAPI_arrayinsert                        SqLib_arrayinsert                           = NULL;
+SqLibAPI_setdelegate                        SqLib_setdelegate                           = NULL;
+SqLibAPI_getdelegate                        SqLib_getdelegate                           = NULL;
+SqLibAPI_clone                              SqLib_clone                                 = NULL;
+SqLibAPI_setfreevariable                    SqLib_setfreevariable                       = NULL;
+SqLibAPI_next                               SqLib_next                                  = NULL;
+SqLibAPI_getweakrefval                      SqLib_getweakrefval                         = NULL;
+SqLibAPI_clear                              SqLib_clear                                 = NULL;
+
+//calls
+SqLibAPI_call                               SqLib_call                                  = NULL;
+SqLibAPI_resume                             SqLib_resume                                = NULL;
+SqLibAPI_getlocal                           SqLib_getlocal                              = NULL;
+SqLibAPI_getcallee                          SqLib_getcallee                             = NULL;
+SqLibAPI_getfreevariable                    SqLib_getfreevariable                       = NULL;
+SqLibAPI_throwerror                         SqLib_throwerror                            = NULL;
+SqLibAPI_throwobject                        SqLib_throwobject                           = NULL;
+SqLibAPI_reseterror                         SqLib_reseterror                            = NULL;
+SqLibAPI_getlasterror                       SqLib_getlasterror                          = NULL;
+
+//raw object handling
+SqLibAPI_getstackobj                        SqLib_getstackobj                           = NULL;
+SqLibAPI_pushobject                         SqLib_pushobject                            = NULL;
+SqLibAPI_addref                             SqLib_addref                                = NULL;
+SqLibAPI_release                            SqLib_release                               = NULL;
+SqLibAPI_getrefcount                        SqLib_getrefcount                           = NULL;
+SqLibAPI_resetobject                        SqLib_resetobject                           = NULL;
+SqLibAPI_objtostring                        SqLib_objtostring                           = NULL;
+SqLibAPI_objtobool                          SqLib_objtobool                             = NULL;
+SqLibAPI_objtointeger                       SqLib_objtointeger                          = NULL;
+SqLibAPI_objtofloat                         SqLib_objtofloat                            = NULL;
+SqLibAPI_objtouserpointer                   SqLib_objtouserpointer                      = NULL;
+SqLibAPI_getobjtypetag                      SqLib_getobjtypetag                         = NULL;
+SqLibAPI_getvmrefcount                      SqLib_getvmrefcount                         = NULL;
+
+//GC
+SqLibAPI_collectgarbage                     SqLib_collectgarbage                        = NULL;
+SqLibAPI_resurrectunreachable               SqLib_resurrectunreachable                  = NULL;
+
+//serialization
+SqLibAPI_writeclosure                       SqLib_writeclosure                          = NULL;
+SqLibAPI_readclosure                        SqLib_readclosure                           = NULL;
+
+//mem allocation
+SqLibAPI_malloc                             SqLib_malloc                                = NULL;
+SqLibAPI_realloc                            SqLib_realloc                               = NULL;
+SqLibAPI_free                               SqLib_free                                  = NULL;
+
+//debug
+SqLibAPI_stackinfos                         SqLib_stackinfos                            = NULL;
+SqLibAPI_setdebughook                       SqLib_setdebughook                          = NULL;
+SqLibAPI_setnativedebughook                 SqLib_setnativedebughook                    = NULL;
+
+//compiler helpers
+SqLibAPI_loadfile                           SqLib_loadfile                              = NULL;
+SqLibAPI_dofile                             SqLib_dofile                                = NULL;
+SqLibAPI_writeclosuretofile                 SqLib_writeclosuretofile                    = NULL;
+
+//blob
+SqLibAPI_createblob                         SqLib_createblob                            = NULL;
+SqLibAPI_getblob                            SqLib_getblob                               = NULL;
+SqLibAPI_getblobsize                        SqLib_getblobsize                           = NULL;
+
+//string
+SqLibAPI_format                             SqLib_format                                = NULL;
+#endif // SQMOD_PLUGIN_API
+
+// ------------------------------------------------------------------------------------------------
+uint8_t sqlib_api_expand(HSQLIBAPI sqlibapi)
+{
+    if (!sqlibapi)
+    {
+        return 0;
+    }
+
+#ifdef SQMOD_PLUGIN_API
+
+    //vm
+    SqLib_open                                  = sqlibapi->open;
+    SqLib_newthread                             = sqlibapi->newthread;
+    SqLib_seterrorhandler                       = sqlibapi->seterrorhandler;
+    SqLib_close                                 = sqlibapi->close;
+    SqLib_setforeignptr                         = sqlibapi->setforeignptr;
+    SqLib_getforeignptr                         = sqlibapi->getforeignptr;
+    SqLib_setsharedforeignptr                   = sqlibapi->setsharedforeignptr;
+    SqLib_getsharedforeignptr                   = sqlibapi->getsharedforeignptr;
+    SqLib_setvmreleasehook                      = sqlibapi->setvmreleasehook;
+    SqLib_getvmreleasehook                      = sqlibapi->getvmreleasehook;
+    SqLib_setsharedreleasehook                  = sqlibapi->setsharedreleasehook;
+    SqLib_getsharedreleasehook                  = sqlibapi->getsharedreleasehook;
+    SqLib_setprintfunc                          = sqlibapi->setprintfunc;
+    SqLib_getprintfunc                          = sqlibapi->getprintfunc;
+    SqLib_geterrorfunc                          = sqlibapi->geterrorfunc;
+    SqLib_suspendvm                             = sqlibapi->suspendvm;
+    SqLib_wakeupvm                              = sqlibapi->wakeupvm;
+    SqLib_getvmstate                            = sqlibapi->getvmstate;
+    SqLib_getversion                            = sqlibapi->getversion;
+
+    //compiler
+    SqLib_compile                               = sqlibapi->compile;
+    SqLib_compilebuffer                         = sqlibapi->compilebuffer;
+    SqLib_enabledebuginfo                       = sqlibapi->enabledebuginfo;
+    SqLib_notifyallexceptions                   = sqlibapi->notifyallexceptions;
+    SqLib_setcompilererrorhandler               = sqlibapi->setcompilererrorhandler;
+
+    //stack operations
+    SqLib_push                                  = sqlibapi->push;
+    SqLib_pop                                   = sqlibapi->pop;
+    SqLib_poptop                                = sqlibapi->poptop;
+    SqLib_remove                                = sqlibapi->remove;
+    SqLib_gettop                                = sqlibapi->gettop;
+    SqLib_settop                                = sqlibapi->settop;
+    SqLib_reservestack                          = sqlibapi->reservestack;
+    SqLib_cmp                                   = sqlibapi->cmp;
+    SqLib_move                                  = sqlibapi->move;
+
+    //object creation handling
+    SqLib_newuserdata                           = sqlibapi->newuserdata;
+    SqLib_newtable                              = sqlibapi->newtable;
+    SqLib_newtableex                            = sqlibapi->newtableex;
+    SqLib_newarray                              = sqlibapi->newarray;
+    SqLib_newclosure                            = sqlibapi->newclosure;
+    SqLib_setparamscheck                        = sqlibapi->setparamscheck;
+    SqLib_bindenv                               = sqlibapi->bindenv;
+    SqLib_setclosureroot                        = sqlibapi->setclosureroot;
+    SqLib_getclosureroot                        = sqlibapi->getclosureroot;
+    SqLib_pushstring                            = sqlibapi->pushstring;
+    SqLib_pushfloat                             = sqlibapi->pushfloat;
+    SqLib_pushinteger                           = sqlibapi->pushinteger;
+    SqLib_pushbool                              = sqlibapi->pushbool;
+    SqLib_pushuserpointer                       = sqlibapi->pushuserpointer;
+    SqLib_pushnull                              = sqlibapi->pushnull;
+    SqLib_pushthread                            = sqlibapi->pushthread;
+    SqLib_gettype                               = sqlibapi->gettype;
+    SqLib_typeof                                = sqlibapi->typeof_;
+    SqLib_getsize                               = sqlibapi->getsize;
+    SqLib_gethash                               = sqlibapi->gethash;
+    SqLib_getbase                               = sqlibapi->getbase;
+    SqLib_instanceof                            = sqlibapi->instanceof;
+    SqLib_tostring                              = sqlibapi->tostring;
+    SqLib_tobool                                = sqlibapi->tobool;
+    SqLib_getstringandsize                      = sqlibapi->getstringandsize;
+    SqLib_getstring                             = sqlibapi->getstring;
+    SqLib_getinteger                            = sqlibapi->getinteger;
+    SqLib_getfloat                              = sqlibapi->getfloat;
+    SqLib_getbool                               = sqlibapi->getbool;
+    SqLib_getthread                             = sqlibapi->getthread;
+    SqLib_getuserpointer                        = sqlibapi->getuserpointer;
+    SqLib_getuserdata                           = sqlibapi->getuserdata;
+    SqLib_settypetag                            = sqlibapi->settypetag;
+    SqLib_gettypetag                            = sqlibapi->gettypetag;
+    SqLib_setreleasehook                        = sqlibapi->setreleasehook;
+    SqLib_getreleasehook                        = sqlibapi->getreleasehook;
+    SqLib_getscratchpad                         = sqlibapi->getscratchpad;
+    SqLib_getfunctioninfo                       = sqlibapi->getfunctioninfo;
+    SqLib_getclosureinfo                        = sqlibapi->getclosureinfo;
+    SqLib_getclosurename                        = sqlibapi->getclosurename;
+    SqLib_setnativeclosurename                  = sqlibapi->setnativeclosurename;
+    SqLib_setinstanceup                         = sqlibapi->setinstanceup;
+    SqLib_getinstanceup                         = sqlibapi->getinstanceup;
+    SqLib_setclassudsize                        = sqlibapi->setclassudsize;
+    SqLib_newclass                              = sqlibapi->newclass;
+    SqLib_createinstance                        = sqlibapi->createinstance;
+    SqLib_setattributes                         = sqlibapi->setattributes;
+    SqLib_getattributes                         = sqlibapi->getattributes;
+    SqLib_getclass                              = sqlibapi->getclass;
+    SqLib_weakref                               = sqlibapi->weakref;
+    SqLib_getdefaultdelegate                    = sqlibapi->getdefaultdelegate;
+    SqLib_getmemberhandle                       = sqlibapi->getmemberhandle;
+    SqLib_getbyhandle                           = sqlibapi->getbyhandle;
+    SqLib_setbyhandle                           = sqlibapi->setbyhandle;
+
+    //object manipulation
+    SqLib_pushroottable                         = sqlibapi->pushroottable;
+    SqLib_pushregistrytable                     = sqlibapi->pushregistrytable;
+    SqLib_pushconsttable                        = sqlibapi->pushconsttable;
+    SqLib_setroottable                          = sqlibapi->setroottable;
+    SqLib_setconsttable                         = sqlibapi->setconsttable;
+    SqLib_newslot                               = sqlibapi->newslot;
+    SqLib_deleteslot                            = sqlibapi->deleteslot;
+    SqLib_set                                   = sqlibapi->set;
+    SqLib_get                                   = sqlibapi->get;
+    SqLib_rawget                                = sqlibapi->rawget;
+    SqLib_rawset                                = sqlibapi->rawset;
+    SqLib_rawdeleteslot                         = sqlibapi->rawdeleteslot;
+    SqLib_newmember                             = sqlibapi->newmember;
+    SqLib_rawnewmember                          = sqlibapi->rawnewmember;
+    SqLib_arrayappend                           = sqlibapi->arrayappend;
+    SqLib_arraypop                              = sqlibapi->arraypop;
+    SqLib_arrayresize                           = sqlibapi->arrayresize;
+    SqLib_arrayreverse                          = sqlibapi->arrayreverse;
+    SqLib_arrayremove                           = sqlibapi->arrayremove;
+    SqLib_arrayinsert                           = sqlibapi->arrayinsert;
+    SqLib_setdelegate                           = sqlibapi->setdelegate;
+    SqLib_getdelegate                           = sqlibapi->getdelegate;
+    SqLib_clone                                 = sqlibapi->clone;
+    SqLib_setfreevariable                       = sqlibapi->setfreevariable;
+    SqLib_next                                  = sqlibapi->next;
+    SqLib_getweakrefval                         = sqlibapi->getweakrefval;
+    SqLib_clear                                 = sqlibapi->clear;
+
+    //calls
+    SqLib_call                                  = sqlibapi->call;
+    SqLib_resume                                = sqlibapi->resume;
+    SqLib_getlocal                              = sqlibapi->getlocal;
+    SqLib_getcallee                             = sqlibapi->getcallee;
+    SqLib_getfreevariable                       = sqlibapi->getfreevariable;
+    SqLib_throwerror                            = sqlibapi->throwerror;
+    SqLib_throwobject                           = sqlibapi->throwobject;
+    SqLib_reseterror                            = sqlibapi->reseterror;
+    SqLib_getlasterror                          = sqlibapi->getlasterror;
+
+    //raw object handling
+    SqLib_getstackobj                           = sqlibapi->getstackobj;
+    SqLib_pushobject                            = sqlibapi->pushobject;
+    SqLib_addref                                = sqlibapi->addref;
+    SqLib_release                               = sqlibapi->release;
+    SqLib_getrefcount                           = sqlibapi->getrefcount;
+    SqLib_resetobject                           = sqlibapi->resetobject;
+    SqLib_objtostring                           = sqlibapi->objtostring;
+    SqLib_objtobool                             = sqlibapi->objtobool;
+    SqLib_objtointeger                          = sqlibapi->objtointeger;
+    SqLib_objtofloat                            = sqlibapi->objtofloat;
+    SqLib_objtouserpointer                      = sqlibapi->objtouserpointer;
+    SqLib_getobjtypetag                         = sqlibapi->getobjtypetag;
+    SqLib_getvmrefcount                         = sqlibapi->getvmrefcount;
+
+    //GC
+    SqLib_collectgarbage                        = sqlibapi->collectgarbage;
+    SqLib_resurrectunreachable                  = sqlibapi->resurrectunreachable;
+
+    //serialization
+    SqLib_writeclosure                          = sqlibapi->writeclosure;
+    SqLib_readclosure                           = sqlibapi->readclosure;
+
+    //mem allocation
+    SqLib_malloc                                = sqlibapi->malloc;
+    SqLib_realloc                               = sqlibapi->realloc;
+    SqLib_free                                  = sqlibapi->free;
+
+    //debug
+    SqLib_stackinfos                            = sqlibapi->stackinfos;
+    SqLib_setdebughook                          = sqlibapi->setdebughook;
+    SqLib_setnativedebughook                    = sqlibapi->setnativedebughook;
+
+    //compiler helpers
+    SqLib_loadfile                              = sqlibapi->loadfile;
+    SqLib_dofile                                = sqlibapi->dofile;
+    SqLib_writeclosuretofile                    = sqlibapi->writeclosuretofile;
+
+    //blob
+    SqLib_createblob                            = sqlibapi->createblob;
+    SqLib_getblob                               = sqlibapi->getblob;
+    SqLib_getblobsize                           = sqlibapi->getblobsize;
+
+    //string
+    SqLib_format                                = sqlibapi->format;
+
+#endif // SQMOD_PLUGIN_API
+
+    return 1;
+}
+
+// ------------------------------------------------------------------------------------------------
+void sqlib_api_collapse()
+{
+#ifdef SQMOD_PLUGIN_API
+
+    //vm
+    SqLib_open                                  = NULL;
+    SqLib_newthread                             = NULL;
+    SqLib_seterrorhandler                       = NULL;
+    SqLib_close                                 = NULL;
+    SqLib_setforeignptr                         = NULL;
+    SqLib_getforeignptr                         = NULL;
+    SqLib_setsharedforeignptr                   = NULL;
+    SqLib_getsharedforeignptr                   = NULL;
+    SqLib_setvmreleasehook                      = NULL;
+    SqLib_getvmreleasehook                      = NULL;
+    SqLib_setsharedreleasehook                  = NULL;
+    SqLib_getsharedreleasehook                  = NULL;
+    SqLib_setprintfunc                          = NULL;
+    SqLib_getprintfunc                          = NULL;
+    SqLib_geterrorfunc                          = NULL;
+    SqLib_suspendvm                             = NULL;
+    SqLib_wakeupvm                              = NULL;
+    SqLib_getvmstate                            = NULL;
+    SqLib_getversion                            = NULL;
+
+    //compiler
+    SqLib_compile                               = NULL;
+    SqLib_compilebuffer                         = NULL;
+    SqLib_enabledebuginfo                       = NULL;
+    SqLib_notifyallexceptions                   = NULL;
+    SqLib_setcompilererrorhandler               = NULL;
+
+    //stack operations
+    SqLib_push                                  = NULL;
+    SqLib_pop                                   = NULL;
+    SqLib_poptop                                = NULL;
+    SqLib_remove                                = NULL;
+    SqLib_gettop                                = NULL;
+    SqLib_settop                                = NULL;
+    SqLib_reservestack                          = NULL;
+    SqLib_cmp                                   = NULL;
+    SqLib_move                                  = NULL;
+
+    //object creation handling
+    SqLib_newuserdata                           = NULL;
+    SqLib_newtable                              = NULL;
+    SqLib_newtableex                            = NULL;
+    SqLib_newarray                              = NULL;
+    SqLib_newclosure                            = NULL;
+    SqLib_setparamscheck                        = NULL;
+    SqLib_bindenv                               = NULL;
+    SqLib_setclosureroot                        = NULL;
+    SqLib_getclosureroot                        = NULL;
+    SqLib_pushstring                            = NULL;
+    SqLib_pushfloat                             = NULL;
+    SqLib_pushinteger                           = NULL;
+    SqLib_pushbool                              = NULL;
+    SqLib_pushuserpointer                       = NULL;
+    SqLib_pushnull                              = NULL;
+    SqLib_pushthread                            = NULL;
+    SqLib_gettype                               = NULL;
+    SqLib_typeof                                = NULL;
+    SqLib_getsize                               = NULL;
+    SqLib_gethash                               = NULL;
+    SqLib_getbase                               = NULL;
+    SqLib_instanceof                            = NULL;
+    SqLib_tostring                              = NULL;
+    SqLib_tobool                                = NULL;
+    SqLib_getstringandsize                      = NULL;
+    SqLib_getstring                             = NULL;
+    SqLib_getinteger                            = NULL;
+    SqLib_getfloat                              = NULL;
+    SqLib_getbool                               = NULL;
+    SqLib_getthread                             = NULL;
+    SqLib_getuserpointer                        = NULL;
+    SqLib_getuserdata                           = NULL;
+    SqLib_settypetag                            = NULL;
+    SqLib_gettypetag                            = NULL;
+    SqLib_setreleasehook                        = NULL;
+    SqLib_getreleasehook                        = NULL;
+    SqLib_getscratchpad                         = NULL;
+    SqLib_getfunctioninfo                       = NULL;
+    SqLib_getclosureinfo                        = NULL;
+    SqLib_getclosurename                        = NULL;
+    SqLib_setnativeclosurename                  = NULL;
+    SqLib_setinstanceup                         = NULL;
+    SqLib_getinstanceup                         = NULL;
+    SqLib_setclassudsize                        = NULL;
+    SqLib_newclass                              = NULL;
+    SqLib_createinstance                        = NULL;
+    SqLib_setattributes                         = NULL;
+    SqLib_getattributes                         = NULL;
+    SqLib_getclass                              = NULL;
+    SqLib_weakref                               = NULL;
+    SqLib_getdefaultdelegate                    = NULL;
+    SqLib_getmemberhandle                       = NULL;
+    SqLib_getbyhandle                           = NULL;
+    SqLib_setbyhandle                           = NULL;
+
+    //object manipulation
+    SqLib_pushroottable                         = NULL;
+    SqLib_pushregistrytable                     = NULL;
+    SqLib_pushconsttable                        = NULL;
+    SqLib_setroottable                          = NULL;
+    SqLib_setconsttable                         = NULL;
+    SqLib_newslot                               = NULL;
+    SqLib_deleteslot                            = NULL;
+    SqLib_set                                   = NULL;
+    SqLib_get                                   = NULL;
+    SqLib_rawget                                = NULL;
+    SqLib_rawset                                = NULL;
+    SqLib_rawdeleteslot                         = NULL;
+    SqLib_newmember                             = NULL;
+    SqLib_rawnewmember                          = NULL;
+    SqLib_arrayappend                           = NULL;
+    SqLib_arraypop                              = NULL;
+    SqLib_arrayresize                           = NULL;
+    SqLib_arrayreverse                          = NULL;
+    SqLib_arrayremove                           = NULL;
+    SqLib_arrayinsert                           = NULL;
+    SqLib_setdelegate                           = NULL;
+    SqLib_getdelegate                           = NULL;
+    SqLib_clone                                 = NULL;
+    SqLib_setfreevariable                       = NULL;
+    SqLib_next                                  = NULL;
+    SqLib_getweakrefval                         = NULL;
+    SqLib_clear                                 = NULL;
+
+    //calls
+    SqLib_call                                  = NULL;
+    SqLib_resume                                = NULL;
+    SqLib_getlocal                              = NULL;
+    SqLib_getcallee                             = NULL;
+    SqLib_getfreevariable                       = NULL;
+    SqLib_throwerror                            = NULL;
+    SqLib_throwobject                           = NULL;
+    SqLib_reseterror                            = NULL;
+    SqLib_getlasterror                          = NULL;
+
+    //raw object handling
+    SqLib_getstackobj                           = NULL;
+    SqLib_pushobject                            = NULL;
+    SqLib_addref                                = NULL;
+    SqLib_release                               = NULL;
+    SqLib_getrefcount                           = NULL;
+    SqLib_resetobject                           = NULL;
+    SqLib_objtostring                           = NULL;
+    SqLib_objtobool                             = NULL;
+    SqLib_objtointeger                          = NULL;
+    SqLib_objtofloat                            = NULL;
+    SqLib_objtouserpointer                      = NULL;
+    SqLib_getobjtypetag                         = NULL;
+    SqLib_getvmrefcount                         = NULL;
+
+    //GC
+    SqLib_collectgarbage                        = NULL;
+    SqLib_resurrectunreachable                  = NULL;
+
+    //serialization
+    SqLib_writeclosure                          = NULL;
+    SqLib_readclosure                           = NULL;
+
+    //mem allocation
+    SqLib_malloc                                = NULL;
+    SqLib_realloc                               = NULL;
+    SqLib_free                                  = NULL;
+
+    //debug
+    SqLib_stackinfos                            = NULL;
+    SqLib_setdebughook                          = NULL;
+    SqLib_setnativedebughook                    = NULL;
+
+    //compiler helpers
+    SqLib_loadfile                              = NULL;
+    SqLib_dofile                                = NULL;
+    SqLib_writeclosuretofile                    = NULL;
+
+    //blob
+    SqLib_createblob                            = NULL;
+    SqLib_getblob                               = NULL;
+    SqLib_getblobsize                           = NULL;
+
+    //string
+    SqLib_format                                = NULL;
+
+#endif // SQMOD_PLUGIN_API
+}
diff --git a/source/Exports.cpp b/source/Exports.cpp
index bfa0e860..33b2a704 100644
--- a/source/Exports.cpp
+++ b/source/Exports.cpp
@@ -24,16 +24,6 @@
 // ------------------------------------------------------------------------------------------------
 namespace SqMod {
 
-// ------------------------------------------------------------------------------------------------
-static SQAPI       g_SqAPI;
-static SQEXPORTS   g_SqExports;
-
-// ------------------------------------------------------------------------------------------------
-static HSQAPI GetSquirrelAPI()
-{
-    return &g_SqAPI;
-}
-
 // ------------------------------------------------------------------------------------------------
 static HSQUIRRELVM GetSquirrelVM()
 {
@@ -48,7 +38,7 @@ static SQRESULT SqEx_LoadScript(const SQChar * filepath, SQBool delay)
     {
         return SQ_OK; // The script as added or already existed
     }
-    // The path was invalied or was unable to pool the script
+    // The path was invalid or was unable to pool the script
     return SQ_ERROR;
 }
 
@@ -220,7 +210,7 @@ static SQRESULT SqEx_GetTimestamp(HSQUIRRELVM vm, SQInteger idx, Int64 * num)
     {
         return SQ_ERROR; // Nowhere to save
     }
-    // Is this an instance that we can treat as a Timestamp type?
+    // Is this an instance that we can treat as a Time-stamp type?
     else if (sq_gettype(vm, idx) == OT_INSTANCE)
     {
         // Attempt to obtain the time-stamp and it's value from the stack
@@ -413,7 +403,7 @@ SQRESULT SqEx_PushTime(HSQUIRRELVM vm, uint8_t hour, uint8_t minute, uint8_t sec
 SQRESULT SqEx_GetDatetime(HSQUIRRELVM vm, SQInteger idx, uint16_t * year, uint8_t * month, uint8_t * day,
                             uint8_t * hour, uint8_t * minute, uint8_t * second, uint16_t * millisecond)
 {
-    // Is this an instance that we can treat as a Datetime type?
+    // Is this an instance that we can treat as a Date-time type?
     if (sq_gettype(vm, idx) == OT_INSTANCE)
     {
         // Attempt to obtain the time-stamp and it's value from the stack
@@ -644,258 +634,293 @@ SQInteger SqEx_GetBufferCursor(HSQUIRRELVM vm, SQInteger idx)
 }
 
 // ------------------------------------------------------------------------------------------------
-void InitExports()
+static int32_t SqExport_PopulateModuleAPI(HSQMODAPI api, size_t size)
 {
-    static HSQEXPORTS sqexports = &g_SqExports;
+    if (!api)
+    {
+        return 0; // Nothing to populate!
+    }
+    else if (size != sizeof(SQMODAPI))
+    {
+        return -1; // Incompatible API!
+    }
 
-    // Assign the functions that should be exported
-    g_SqExports.StructSize              = sizeof(SQEXPORTS);
-    g_SqExports.GetSquirrelAPI          = GetSquirrelAPI;
-    g_SqExports.GetSquirrelVM           = GetSquirrelVM;
+    //primitive functions
+    api->GetSquirrelVM              = GetSquirrelVM;
 
     //logging utilities
-    g_SqExports.LogDbg                  = LogDbg;
-    g_SqExports.LogUsr                  = LogUsr;
-    g_SqExports.LogScs                  = LogScs;
-    g_SqExports.LogInf                  = LogInf;
-    g_SqExports.LogWrn                  = LogWrn;
-    g_SqExports.LogErr                  = LogErr;
-    g_SqExports.LogFtl                  = LogFtl;
-    g_SqExports.LogSDbg                 = LogSDbg;
-    g_SqExports.LogSUsr                 = LogSUsr;
-    g_SqExports.LogSScs                 = LogSScs;
-    g_SqExports.LogSInf                 = LogSInf;
-    g_SqExports.LogSWrn                 = LogSWrn;
-    g_SqExports.LogSErr                 = LogSErr;
-    g_SqExports.LogSFtl                 = LogSFtl;
+    api->LogDbg                     = LogDbg;
+    api->LogUsr                     = LogUsr;
+    api->LogScs                     = LogScs;
+    api->LogInf                     = LogInf;
+    api->LogWrn                     = LogWrn;
+    api->LogErr                     = LogErr;
+    api->LogFtl                     = LogFtl;
+    api->LogSDbg                    = LogSDbg;
+    api->LogSUsr                    = LogSUsr;
+    api->LogSScs                    = LogSScs;
+    api->LogSInf                    = LogSInf;
+    api->LogSWrn                    = LogSWrn;
+    api->LogSErr                    = LogSErr;
+    api->LogSFtl                    = LogSFtl;
 
     //script loading
-    g_SqExports.LoadScript              = SqEx_LoadScript;
+    api->LoadScript                 = SqEx_LoadScript;
 
     //numeric utilities
-    g_SqExports.GetSLongValue           = SqEx_GetSLongValue;
-    g_SqExports.PushSLongObject         = SqEx_PushSLongObject;
-    g_SqExports.GetULongValue           = SqEx_GetULongValue;
-    g_SqExports.PushULongObject         = SqEx_PushULongObject;
+    api->GetSLongValue              = SqEx_GetSLongValue;
+    api->PushSLongObject            = SqEx_PushSLongObject;
+    api->GetULongValue              = SqEx_GetULongValue;
+    api->PushULongObject            = SqEx_PushULongObject;
 
     //time utilities
-    g_SqExports.GetCurrentSysTime       = Chrono::GetCurrentSysTime;
-    g_SqExports.GetEpochTimeMicro       = Chrono::GetEpochTimeMicro;
-    g_SqExports.GetEpochTimeMilli       = Chrono::GetEpochTimeMilli;
-    g_SqExports.ValidDate               = SqEx_ValidDate;
-    g_SqExports.IsLeapYear              = SqEx_IsLeapYear;
-    g_SqExports.DaysInYear              = Chrono::DaysInYear;
-    g_SqExports.DaysInMonth             = Chrono::DaysInMonth;
-    g_SqExports.DayOfYear               = Chrono::DayOfYear;
-    g_SqExports.DateRangeToSeconds      = Chrono::DateRangeToSeconds;
-    g_SqExports.GetTimestamp            = SqEx_GetTimestamp;
-    g_SqExports.PushTimestamp           = SqEx_PushTimestamp;
-    g_SqExports.GetDate                 = SqEx_GetDate;
-    g_SqExports.PushDate                = SqEx_PushDate;
-    g_SqExports.GetTime                 = SqEx_GetTime;
-    g_SqExports.PushTime                = SqEx_PushTime;
-    g_SqExports.GetDatetime             = SqEx_GetDatetime;
-    g_SqExports.PushDatetime            = SqEx_PushDatetime;
+    api->GetCurrentSysTime          = Chrono::GetCurrentSysTime;
+    api->GetEpochTimeMicro          = Chrono::GetEpochTimeMicro;
+    api->GetEpochTimeMilli          = Chrono::GetEpochTimeMilli;
+    api->ValidDate                  = SqEx_ValidDate;
+    api->IsLeapYear                 = SqEx_IsLeapYear;
+    api->DaysInYear                 = Chrono::DaysInYear;
+    api->DaysInMonth                = Chrono::DaysInMonth;
+    api->DayOfYear                  = Chrono::DayOfYear;
+    api->DateRangeToSeconds         = Chrono::DateRangeToSeconds;
+    api->GetTimestamp               = SqEx_GetTimestamp;
+    api->PushTimestamp              = SqEx_PushTimestamp;
+    api->GetDate                    = SqEx_GetDate;
+    api->PushDate                   = SqEx_PushDate;
+    api->GetTime                    = SqEx_GetTime;
+    api->PushTime                   = SqEx_PushTime;
+    api->GetDatetime                = SqEx_GetDatetime;
+    api->PushDatetime               = SqEx_PushDatetime;
 
     //stack utilities
-    g_SqExports.PopStackInteger         = PopStackInteger;
-    g_SqExports.PopStackFloat           = PopStackFloat;
-    g_SqExports.PopStackSLong           = PopStackSLong;
-    g_SqExports.PopStackULong           = PopStackULong;
+    api->PopStackInteger            = PopStackInteger;
+    api->PopStackFloat              = PopStackFloat;
+    api->PopStackSLong              = PopStackSLong;
+    api->PopStackULong              = PopStackULong;
 
     //buffer utilities
-    g_SqExports.PushBuffer              = SqEx_PushBuffer;
-    g_SqExports.PushBufferData          = SqEx_PushBufferData;
-    g_SqExports.GetBufferInfo           = SqEx_GetBufferInfo;
-    g_SqExports.GetBufferData           = SqEx_GetBufferData;
-    g_SqExports.GetBufferSize           = SqEx_GetBufferSize;
-    g_SqExports.GetBufferCursor         = SqEx_GetBufferCursor;
+    api->PushBuffer                 = SqEx_PushBuffer;
+    api->PushBufferData             = SqEx_PushBufferData;
+    api->GetBufferInfo              = SqEx_GetBufferInfo;
+    api->GetBufferData              = SqEx_GetBufferData;
+    api->GetBufferSize              = SqEx_GetBufferSize;
+    api->GetBufferCursor            = SqEx_GetBufferCursor;
 
-    // Export them to the server
-    _Func->ExportFunctions(_Info->pluginId,
-                            const_cast< const void ** >(reinterpret_cast< void ** >(&sqexports)),
-                            sizeof(SQEXPORTS));
+    return 1; // Successfully populated!
+}
+
+// ------------------------------------------------------------------------------------------------
+static int32_t SqExport_PopulateSquirrelAPI(HSQLIBAPI api, size_t size)
+{
+    if (!api)
+    {
+        return 0; // Nothing to populate!
+    }
+    else if (size != sizeof(SQLIBAPI))
+    {
+        return -1; // Incompatible API!
+    }
 
     //vm
-    g_SqAPI.open                        = sq_open;
-    g_SqAPI.newthread                   = sq_newthread;
-    g_SqAPI.seterrorhandler             = sq_seterrorhandler;
-    g_SqAPI.close                       = sq_close;
-    g_SqAPI.setforeignptr               = sq_setforeignptr;
-    g_SqAPI.getforeignptr               = sq_getforeignptr;
-    g_SqAPI.setsharedforeignptr         = sq_setsharedforeignptr;
-    g_SqAPI.getsharedforeignptr         = sq_getsharedforeignptr;
-    g_SqAPI.setvmreleasehook            = sq_setvmreleasehook;
-    g_SqAPI.getvmreleasehook            = sq_getvmreleasehook;
-    g_SqAPI.setsharedreleasehook        = sq_setsharedreleasehook;
-    g_SqAPI.getsharedreleasehook        = sq_getsharedreleasehook;
-    g_SqAPI.setprintfunc                = sq_setprintfunc;
-    g_SqAPI.getprintfunc                = sq_getprintfunc;
-    g_SqAPI.geterrorfunc                = sq_geterrorfunc;
-    g_SqAPI.suspendvm                   = sq_suspendvm;
-    g_SqAPI.wakeupvm                    = sq_wakeupvm;
-    g_SqAPI.getvmstate                  = sq_getvmstate;
-    g_SqAPI.getversion                  = sq_getversion;
+    api->open                           = sq_open;
+    api->newthread                      = sq_newthread;
+    api->seterrorhandler                = sq_seterrorhandler;
+    api->close                          = sq_close;
+    api->setforeignptr                  = sq_setforeignptr;
+    api->getforeignptr                  = sq_getforeignptr;
+    api->setsharedforeignptr            = sq_setsharedforeignptr;
+    api->getsharedforeignptr            = sq_getsharedforeignptr;
+    api->setvmreleasehook               = sq_setvmreleasehook;
+    api->getvmreleasehook               = sq_getvmreleasehook;
+    api->setsharedreleasehook           = sq_setsharedreleasehook;
+    api->getsharedreleasehook           = sq_getsharedreleasehook;
+    api->setprintfunc                   = sq_setprintfunc;
+    api->getprintfunc                   = sq_getprintfunc;
+    api->geterrorfunc                   = sq_geterrorfunc;
+    api->suspendvm                      = sq_suspendvm;
+    api->wakeupvm                       = sq_wakeupvm;
+    api->getvmstate                     = sq_getvmstate;
+    api->getversion                     = sq_getversion;
 
     //compiler
-    g_SqAPI.compile                     = sq_compile;
-    g_SqAPI.compilebuffer               = sq_compilebuffer;
-    g_SqAPI.enabledebuginfo             = sq_enabledebuginfo;
-    g_SqAPI.notifyallexceptions         = sq_notifyallexceptions;
-    g_SqAPI.setcompilererrorhandler     = sq_setcompilererrorhandler;
+    api->compile                        = sq_compile;
+    api->compilebuffer                  = sq_compilebuffer;
+    api->enabledebuginfo                = sq_enabledebuginfo;
+    api->notifyallexceptions            = sq_notifyallexceptions;
+    api->setcompilererrorhandler        = sq_setcompilererrorhandler;
 
     //stack operations
-    g_SqAPI.push                        = sq_push;
-    g_SqAPI.pop                         = sq_pop;
-    g_SqAPI.poptop                      = sq_poptop;
-    g_SqAPI.remove                      = sq_remove;
-    g_SqAPI.gettop                      = sq_gettop;
-    g_SqAPI.settop                      = sq_settop;
-    g_SqAPI.reservestack                = sq_reservestack;
-    g_SqAPI.cmp                         = sq_cmp;
-    g_SqAPI.move                        = sq_move;
+    api->push                           = sq_push;
+    api->pop                            = sq_pop;
+    api->poptop                         = sq_poptop;
+    api->remove                         = sq_remove;
+    api->gettop                         = sq_gettop;
+    api->settop                         = sq_settop;
+    api->reservestack                   = sq_reservestack;
+    api->cmp                            = sq_cmp;
+    api->move                           = sq_move;
 
     //object creation handling
-    g_SqAPI.newuserdata                 = sq_newuserdata;
-    g_SqAPI.newtable                    = sq_newtable;
-    g_SqAPI.newtableex                  = sq_newtableex;
-    g_SqAPI.newarray                    = sq_newarray;
-    g_SqAPI.newclosure                  = sq_newclosure;
-    g_SqAPI.setparamscheck              = sq_setparamscheck;
-    g_SqAPI.bindenv                     = sq_bindenv;
-    g_SqAPI.setclosureroot              = sq_setclosureroot;
-    g_SqAPI.getclosureroot              = sq_getclosureroot;
-    g_SqAPI.pushstring                  = sq_pushstring;
-    g_SqAPI.pushfloat                   = sq_pushfloat;
-    g_SqAPI.pushinteger                 = sq_pushinteger;
-    g_SqAPI.pushbool                    = sq_pushbool;
-    g_SqAPI.pushuserpointer             = sq_pushuserpointer;
-    g_SqAPI.pushnull                    = sq_pushnull;
-    g_SqAPI.pushthread                  = sq_pushthread;
-    g_SqAPI.gettype                     = sq_gettype;
-    g_SqAPI.typeof_                     = sq_typeof;
-    g_SqAPI.getsize                     = sq_getsize;
-    g_SqAPI.gethash                     = sq_gethash;
-    g_SqAPI.getbase                     = sq_getbase;
-    g_SqAPI.instanceof                  = sq_instanceof;
-    g_SqAPI.tostring                    = sq_tostring;
-    g_SqAPI.tobool                      = sq_tobool;
-    g_SqAPI.getstringandsize            = sq_getstringandsize;
-    g_SqAPI.getstring                   = sq_getstring;
-    g_SqAPI.getinteger                  = sq_getinteger;
-    g_SqAPI.getfloat                    = sq_getfloat;
-    g_SqAPI.getbool                     = sq_getbool;
-    g_SqAPI.getthread                   = sq_getthread;
-    g_SqAPI.getuserpointer              = sq_getuserpointer;
-    g_SqAPI.getuserdata                 = sq_getuserdata;
-    g_SqAPI.settypetag                  = sq_settypetag;
-    g_SqAPI.gettypetag                  = sq_gettypetag;
-    g_SqAPI.setreleasehook              = sq_setreleasehook;
-    g_SqAPI.getreleasehook              = sq_getreleasehook;
-    g_SqAPI.getscratchpad               = sq_getscratchpad;
-    g_SqAPI.getfunctioninfo             = sq_getfunctioninfo;
-    g_SqAPI.getclosureinfo              = sq_getclosureinfo;
-    g_SqAPI.getclosurename              = sq_getclosurename;
-    g_SqAPI.setnativeclosurename        = sq_setnativeclosurename;
-    g_SqAPI.setinstanceup               = sq_setinstanceup;
-    g_SqAPI.getinstanceup               = sq_getinstanceup;
-    g_SqAPI.setclassudsize              = sq_setclassudsize;
-    g_SqAPI.newclass                    = sq_newclass;
-    g_SqAPI.createinstance              = sq_createinstance;
-    g_SqAPI.setattributes               = sq_setattributes;
-    g_SqAPI.getattributes               = sq_getattributes;
-    g_SqAPI.getclass                    = sq_getclass;
-    g_SqAPI.weakref                     = sq_weakref;
-    g_SqAPI.getdefaultdelegate          = sq_getdefaultdelegate;
-    g_SqAPI.getmemberhandle             = sq_getmemberhandle;
-    g_SqAPI.getbyhandle                 = sq_getbyhandle;
-    g_SqAPI.setbyhandle                 = sq_setbyhandle;
+    api->newuserdata                    = sq_newuserdata;
+    api->newtable                       = sq_newtable;
+    api->newtableex                     = sq_newtableex;
+    api->newarray                       = sq_newarray;
+    api->newclosure                     = sq_newclosure;
+    api->setparamscheck                 = sq_setparamscheck;
+    api->bindenv                        = sq_bindenv;
+    api->setclosureroot                 = sq_setclosureroot;
+    api->getclosureroot                 = sq_getclosureroot;
+    api->pushstring                     = sq_pushstring;
+    api->pushfloat                      = sq_pushfloat;
+    api->pushinteger                    = sq_pushinteger;
+    api->pushbool                       = sq_pushbool;
+    api->pushuserpointer                = sq_pushuserpointer;
+    api->pushnull                       = sq_pushnull;
+    api->pushthread                     = sq_pushthread;
+    api->gettype                        = sq_gettype;
+    api->typeof_                        = sq_typeof;
+    api->getsize                        = sq_getsize;
+    api->gethash                        = sq_gethash;
+    api->getbase                        = sq_getbase;
+    api->instanceof                     = sq_instanceof;
+    api->tostring                       = sq_tostring;
+    api->tobool                         = sq_tobool;
+    api->getstringandsize               = sq_getstringandsize;
+    api->getstring                      = sq_getstring;
+    api->getinteger                     = sq_getinteger;
+    api->getfloat                       = sq_getfloat;
+    api->getbool                        = sq_getbool;
+    api->getthread                      = sq_getthread;
+    api->getuserpointer                 = sq_getuserpointer;
+    api->getuserdata                    = sq_getuserdata;
+    api->settypetag                     = sq_settypetag;
+    api->gettypetag                     = sq_gettypetag;
+    api->setreleasehook                 = sq_setreleasehook;
+    api->getreleasehook                 = sq_getreleasehook;
+    api->getscratchpad                  = sq_getscratchpad;
+    api->getfunctioninfo                = sq_getfunctioninfo;
+    api->getclosureinfo                 = sq_getclosureinfo;
+    api->getclosurename                 = sq_getclosurename;
+    api->setnativeclosurename           = sq_setnativeclosurename;
+    api->setinstanceup                  = sq_setinstanceup;
+    api->getinstanceup                  = sq_getinstanceup;
+    api->setclassudsize                 = sq_setclassudsize;
+    api->newclass                       = sq_newclass;
+    api->createinstance                 = sq_createinstance;
+    api->setattributes                  = sq_setattributes;
+    api->getattributes                  = sq_getattributes;
+    api->getclass                       = sq_getclass;
+    api->weakref                        = sq_weakref;
+    api->getdefaultdelegate             = sq_getdefaultdelegate;
+    api->getmemberhandle                = sq_getmemberhandle;
+    api->getbyhandle                    = sq_getbyhandle;
+    api->setbyhandle                    = sq_setbyhandle;
 
     //object manipulation
-    g_SqAPI.pushroottable               = sq_pushroottable;
-    g_SqAPI.pushregistrytable           = sq_pushregistrytable;
-    g_SqAPI.pushconsttable              = sq_pushconsttable;
-    g_SqAPI.setroottable                = sq_setroottable;
-    g_SqAPI.setconsttable               = sq_setconsttable;
-    g_SqAPI.newslot                     = sq_newslot;
-    g_SqAPI.deleteslot                  = sq_deleteslot;
-    g_SqAPI.set                         = sq_set;
-    g_SqAPI.get                         = sq_get;
-    g_SqAPI.rawget                      = sq_rawget;
-    g_SqAPI.rawset                      = sq_rawset;
-    g_SqAPI.rawdeleteslot               = sq_rawdeleteslot;
-    g_SqAPI.newmember                   = sq_newmember;
-    g_SqAPI.rawnewmember                = sq_rawnewmember;
-    g_SqAPI.arrayappend                 = sq_arrayappend;
-    g_SqAPI.arraypop                    = sq_arraypop;
-    g_SqAPI.arrayresize                 = sq_arrayresize;
-    g_SqAPI.arrayreverse                = sq_arrayreverse;
-    g_SqAPI.arrayremove                 = sq_arrayremove;
-    g_SqAPI.arrayinsert                 = sq_arrayinsert;
-    g_SqAPI.setdelegate                 = sq_setdelegate;
-    g_SqAPI.getdelegate                 = sq_getdelegate;
-    g_SqAPI.clone                       = sq_clone;
-    g_SqAPI.setfreevariable             = sq_setfreevariable;
-    g_SqAPI.next                        = sq_next;
-    g_SqAPI.getweakrefval               = sq_getweakrefval;
-    g_SqAPI.clear                       = sq_clear;
+    api->pushroottable                  = sq_pushroottable;
+    api->pushregistrytable              = sq_pushregistrytable;
+    api->pushconsttable                 = sq_pushconsttable;
+    api->setroottable                   = sq_setroottable;
+    api->setconsttable                  = sq_setconsttable;
+    api->newslot                        = sq_newslot;
+    api->deleteslot                     = sq_deleteslot;
+    api->set                            = sq_set;
+    api->get                            = sq_get;
+    api->rawget                         = sq_rawget;
+    api->rawset                         = sq_rawset;
+    api->rawdeleteslot                  = sq_rawdeleteslot;
+    api->newmember                      = sq_newmember;
+    api->rawnewmember                   = sq_rawnewmember;
+    api->arrayappend                    = sq_arrayappend;
+    api->arraypop                       = sq_arraypop;
+    api->arrayresize                    = sq_arrayresize;
+    api->arrayreverse                   = sq_arrayreverse;
+    api->arrayremove                    = sq_arrayremove;
+    api->arrayinsert                    = sq_arrayinsert;
+    api->setdelegate                    = sq_setdelegate;
+    api->getdelegate                    = sq_getdelegate;
+    api->clone                          = sq_clone;
+    api->setfreevariable                = sq_setfreevariable;
+    api->next                           = sq_next;
+    api->getweakrefval                  = sq_getweakrefval;
+    api->clear                          = sq_clear;
 
     //calls
-    g_SqAPI.call                        = sq_call;
-    g_SqAPI.resume                      = sq_resume;
-    g_SqAPI.getlocal                    = sq_getlocal;
-    g_SqAPI.getcallee                   = sq_getcallee;
-    g_SqAPI.getfreevariable             = sq_getfreevariable;
-    g_SqAPI.throwerror                  = sq_throwerror;
-    g_SqAPI.throwobject                 = sq_throwobject;
-    g_SqAPI.reseterror                  = sq_reseterror;
-    g_SqAPI.getlasterror                = sq_getlasterror;
+    api->call                           = sq_call;
+    api->resume                         = sq_resume;
+    api->getlocal                       = sq_getlocal;
+    api->getcallee                      = sq_getcallee;
+    api->getfreevariable                = sq_getfreevariable;
+    api->throwerror                     = sq_throwerror;
+    api->throwobject                    = sq_throwobject;
+    api->reseterror                     = sq_reseterror;
+    api->getlasterror                   = sq_getlasterror;
 
     //raw object handling
-    g_SqAPI.getstackobj                 = sq_getstackobj;
-    g_SqAPI.pushobject                  = sq_pushobject;
-    g_SqAPI.addref                      = sq_addref;
-    g_SqAPI.release                     = sq_release;
-    g_SqAPI.getrefcount                 = sq_getrefcount;
-    g_SqAPI.resetobject                 = sq_resetobject;
-    g_SqAPI.objtostring                 = sq_objtostring;
-    g_SqAPI.objtobool                   = sq_objtobool;
-    g_SqAPI.objtointeger                = sq_objtointeger;
-    g_SqAPI.objtofloat                  = sq_objtofloat;
-    g_SqAPI.objtouserpointer            = sq_objtouserpointer;
-    g_SqAPI.getobjtypetag               = sq_getobjtypetag;
-    g_SqAPI.getvmrefcount               = sq_getvmrefcount;
+    api->getstackobj                    = sq_getstackobj;
+    api->pushobject                     = sq_pushobject;
+    api->addref                         = sq_addref;
+    api->release                        = sq_release;
+    api->getrefcount                    = sq_getrefcount;
+    api->resetobject                    = sq_resetobject;
+    api->objtostring                    = sq_objtostring;
+    api->objtobool                      = sq_objtobool;
+    api->objtointeger                   = sq_objtointeger;
+    api->objtofloat                     = sq_objtofloat;
+    api->objtouserpointer               = sq_objtouserpointer;
+    api->getobjtypetag                  = sq_getobjtypetag;
+    api->getvmrefcount                  = sq_getvmrefcount;
 
     //GC
-    g_SqAPI.collectgarbage              = sq_collectgarbage;
-    g_SqAPI.resurrectunreachable        = sq_resurrectunreachable;
+    api->collectgarbage                 = sq_collectgarbage;
+    api->resurrectunreachable           = sq_resurrectunreachable;
 
     //serialization
-    g_SqAPI.writeclosure                = sq_writeclosure;
-    g_SqAPI.readclosure                 = sq_readclosure;
+    api->writeclosure                   = sq_writeclosure;
+    api->readclosure                    = sq_readclosure;
 
     //mem allocation
-    g_SqAPI.malloc                      = sq_malloc;
-    g_SqAPI.realloc                     = sq_realloc;
-    g_SqAPI.free                        = sq_free;
+    api->malloc                         = sq_malloc;
+    api->realloc                        = sq_realloc;
+    api->free                           = sq_free;
 
     //debug
-    g_SqAPI.stackinfos                  = sq_stackinfos;
-    g_SqAPI.setdebughook                = sq_setdebughook;
-    g_SqAPI.setnativedebughook          = sq_setnativedebughook;
+    api->stackinfos                     = sq_stackinfos;
+    api->setdebughook                   = sq_setdebughook;
+    api->setnativedebughook             = sq_setnativedebughook;
 
     //compiler helpers
-    g_SqAPI.loadfile                    = sqstd_loadfile;
-    g_SqAPI.dofile                      = sqstd_dofile;
-    g_SqAPI.writeclosuretofile          = sqstd_writeclosuretofile;
+    api->loadfile                       = sqstd_loadfile;
+    api->dofile                         = sqstd_dofile;
+    api->writeclosuretofile             = sqstd_writeclosuretofile;
 
     //blob
-    g_SqAPI.createblob                  = sqstd_createblob;
-    g_SqAPI.getblob                     = sqstd_getblob;
-    g_SqAPI.getblobsize                 = sqstd_getblobsize;
+    api->createblob                     = sqstd_createblob;
+    api->getblob                        = sqstd_getblob;
+    api->getblobsize                    = sqstd_getblobsize;
 
     //string
-    g_SqAPI.format                      = sqstd_format;
+    api->format                         = sqstd_format;
+
+    return 1; // Successfully populated!
+}
+
+// ------------------------------------------------------------------------------------------------
+static const SQMODEXPORTS g_SqModExports{
+    sizeof(SQMODEXPORTS),
+    SqExport_PopulateModuleAPI,
+    SqExport_PopulateSquirrelAPI
+};
+
+// ------------------------------------------------------------------------------------------------
+void InitExports()
+{
+    // The server needs a pointer to a pointer, and a persistent one
+    static const SQMODEXPORTS * sqmodexports = &g_SqModExports;
+
+    // Tell the server about the pointer to the exports structure
+    _Func->ExportFunctions(_Info->pluginId, reinterpret_cast< const void ** >(&sqmodexports),
+                            sizeof(HSQMODEXPORTS));
 }
 
 } // Namespace:: SqMod
diff --git a/source/Main.cpp b/source/Main.cpp
index ec416cb9..e42f40ed 100644
--- a/source/Main.cpp
+++ b/source/Main.cpp
@@ -257,7 +257,6 @@ static void OnPlayerDisconnect(int32_t player_id, vcmpDisconnectReason reason)
     // Attempt to forward the event
     try
     {
-        printf("Disconnecting... %d\n", player_id);
         Core::Get().DisconnectPlayer(player_id, reason, NullObject());
     }
     SQMOD_CATCH_EVENT_EXCEPTION(OnPlayerDisconnect)