diff --git a/Changes b/Changes
index 458681e4a..cdeee31f8 100644
--- a/Changes
+++ b/Changes
@@ -1772,3 +1772,7 @@ MOTDs
 - #0002172 reported by Stealth, patched by WolfSage, fixing if you have an
   admin block, and forget a semicolon on a line, Unreal will proceed to use
   the block with no error, but the information will be incorrect/incomplete.
+- #0003177 patched by aegis, changing non-modular add_Command to
+  CommandAdd's through a huge patch. This may break some things, so heads
+  up. From now on add_Command is unsafe land for modules and may be removed
+  without warning.
diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c
index d79d678c3..6e366769f 100644
--- a/src/modules/l_commands.c
+++ b/src/modules/l_commands.c
@@ -243,7 +243,7 @@ int    l_commands_Init(ModuleInfo *modinfo)
 	Module p;
 #endif
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
 	module_load = ModCmdsInfo->module_load;
 	m_sethost_Init(ModCmdsInfo);
diff --git a/src/modules/m_addmotd.c b/src/modules/m_addmotd.c
index 8d1abf562..a4885ab7d 100644
--- a/src/modules/m_addmotd.c
+++ b/src/modules/m_addmotd.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_addmotd)
 
 DLLFUNC int MOD_INIT(m_addmotd)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd, 1);
+	CommandAdd(modinfo->handle, MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_addmotd)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_addmotd)(int module_unload)
 {
-	if (del_Command(MSG_ADDMOTD, TOK_ADDMOTD, m_addmotd) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_addmotd).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_addomotd.c b/src/modules/m_addomotd.c
index 1492d2f94..5f005a7d2 100644
--- a/src/modules/m_addomotd.c
+++ b/src/modules/m_addomotd.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_addomotd)
 
 DLLFUNC int MOD_INIT(m_addomotd)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd, 1);
+	CommandAdd(modinfo->handle, MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_addomotd)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_addomotd)(int module_unload)
 {
-	if (del_Command(MSG_ADDOMOTD, TOK_ADDOMOTD, m_addomotd) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_addomotd).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_admin.c b/src/modules/m_admin.c
index f2a0a41d1..877842440 100644
--- a/src/modules/m_admin.c
+++ b/src/modules/m_admin.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_admin)
 
 DLLFUNC int MOD_INIT(m_admin)(ModuleInfo *modinfo)
 {
-	add_CommandX(MSG_ADMIN, TOK_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS);
+	CommandAdd(modinfo->handle, MSG_ADMIN, TOK_ADMIN, m_admin, MAXPARA, M_UNREGISTERED|M_USER|M_SHUN|M_VIRUS);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_admin)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_admin)(int module_unload)
 {
-	if (del_Command(MSG_ADMIN, TOK_ADMIN, m_admin) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_admin).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_adminchat.c b/src/modules/m_adminchat.c
index 76c80b58d..74f01c35f 100644
--- a/src/modules/m_adminchat.c
+++ b/src/modules/m_adminchat.c
@@ -64,9 +64,9 @@ ModuleHeader MOD_HEADER(m_adminchat)
 DLLFUNC int MOD_INIT(m_adminchat)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, 1);
+	CommandAdd(modinfo->handle, MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -81,11 +81,6 @@ DLLFUNC int MOD_LOAD(m_adminchat)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_adminchat)(int module_unload)
 {
-	if (del_Command(MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_adminchat).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_akill.c b/src/modules/m_akill.c
index 58365e0a4..c15e82bb3 100644
--- a/src/modules/m_akill.c
+++ b/src/modules/m_akill.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_akill)
 DLLFUNC int MOD_INIT(m_akill)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_AKILL, TOK_AKILL, m_akill, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_AKILL, TOK_AKILL, m_akill, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,11 +79,6 @@ DLLFUNC int MOD_LOAD(m_akill)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_akill)(int module_unload)
 {
-	if (del_Command(MSG_AKILL, TOK_AKILL, m_akill) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_akill).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_away.c b/src/modules/m_away.c
index c29cb2e40..59ff7b4fd 100644
--- a/src/modules/m_away.c
+++ b/src/modules/m_away.c
@@ -62,7 +62,7 @@ DLLFUNC ModuleHeader MOD_HEADER(m_away)
 
 DLLFUNC int MOD_INIT(m_away)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_AWAY, TOK_AWAY, m_away, 1);
+	CommandAdd(modinfo->handle, MSG_AWAY, TOK_AWAY, m_away, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -74,11 +74,6 @@ DLLFUNC int MOD_LOAD(m_away)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_away)(int module_unload)
 {
-	if (del_Command(MSG_AWAY, TOK_AWAY, m_away) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_away).name);
-	}
 	return MOD_SUCCESS;
 }
 /***********************************************************************
diff --git a/src/modules/m_chatops.c b/src/modules/m_chatops.c
index 5935df962..03eb90bc0 100644
--- a/src/modules/m_chatops.c
+++ b/src/modules/m_chatops.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_chatops)
 
 DLLFUNC int MOD_INIT(m_chatops)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_CHATOPS, TOK_CHATOPS, m_chatops, 1);
+	CommandAdd(modinfo->handle, MSG_CHATOPS, TOK_CHATOPS, m_chatops, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_chatops)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_chatops)(int module_unload)
 {
-	if (del_Command(MSG_CHATOPS, TOK_CHATOPS, m_chatops) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_chatops).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c
index 665c150ae..5ea26e286 100644
--- a/src/modules/m_chghost.c
+++ b/src/modules/m_chghost.c
@@ -67,9 +67,9 @@ ModuleHeader MOD_HEADER(m_chghost)
 DLLFUNC int MOD_INIT(m_chghost)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -82,11 +82,6 @@ DLLFUNC int MOD_LOAD(m_chghost)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_chghost)(int module_unload)
 {
-	if (del_Command(MSG_CHGHOST, TOK_CHGHOST, m_chghost) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_chghost).name);
-	}
 	return MOD_SUCCESS;
 	
 }
diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c
index fde6325bf..4dae1cae3 100644
--- a/src/modules/m_chgident.c
+++ b/src/modules/m_chgident.c
@@ -74,9 +74,9 @@ DLLFUNC int MOD_INIT(m_chgident)(ModuleInfo *modinfo)
 	   list
 	*/
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -88,11 +88,6 @@ DLLFUNC int MOD_LOAD(m_chgident)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_chgident)(int module_unload)
 {
-	if (del_Command(MSG_CHGIDENT, TOK_CHGIDENT, m_chgident) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_chgident).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c
index f9b668c22..2bfb3a977 100644
--- a/src/modules/m_chgname.c
+++ b/src/modules/m_chgname.c
@@ -69,10 +69,10 @@ ModuleHeader MOD_HEADER(m_chgname)
 DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
-	*/
-	add_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2);
-	add_Command(MSG_SVSNAME, NULL, m_chgname, 2);
+	 * We call our CommandAdd crap here
+	 */
+	CommandAdd(modinfo->handle, MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVSNAME, NULL, m_chgname, 2, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -88,18 +88,7 @@ DLLFUNC int MOD_LOAD(m_chgname)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_chgname)(int module_unload)
 {
-	if (del_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname) < 0)
-	{
-		sendto_realops("Failed to delete command chgname when unloading %s",
-				MOD_HEADER(m_chgname).name);
-	}
-	if (del_Command(MSG_SVSNAME, NULL, m_chgname) < 0)
-	{
-		sendto_realops("Failed to delete command svsname when unloading %s",
-				MOD_HEADER(m_chgname).name);
-	}
 	return MOD_SUCCESS;
-	
 }
 
 
diff --git a/src/modules/m_close.c b/src/modules/m_close.c
index 98b3c31e4..5bec38014 100644
--- a/src/modules/m_close.c
+++ b/src/modules/m_close.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_close)
 
 DLLFUNC int MOD_INIT(m_close)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_CLOSE, TOK_CLOSE, m_close, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_CLOSE, TOK_CLOSE, m_close, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_close)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_close)(int module_unload)
 {
-	if (del_Command(MSG_CLOSE, TOK_CLOSE, m_close) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_close).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_connect.c b/src/modules/m_connect.c
index 7b556e7e7..e6691a241 100644
--- a/src/modules/m_connect.c
+++ b/src/modules/m_connect.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_connect)
 
 DLLFUNC int MOD_INIT(m_connect)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_CONNECT, TOK_CONNECT, m_connect, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_CONNECT, TOK_CONNECT, m_connect, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_connect)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_connect)(int module_unload)
 {
-	if (del_Command(MSG_CONNECT, TOK_CONNECT, m_connect) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_connect).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_cycle.c b/src/modules/m_cycle.c
index d810efcfe..4ef2cdff7 100644
--- a/src/modules/m_cycle.c
+++ b/src/modules/m_cycle.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_cycle)
 DLLFUNC int MOD_INIT(m_cycle)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_CYCLE, TOK_CYCLE, m_cycle, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_CYCLE, TOK_CYCLE, m_cycle, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,11 +79,6 @@ DLLFUNC int MOD_LOAD(m_cycle)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_cycle)(int module_unload)
 {
-	if (del_Command(MSG_CYCLE, TOK_CYCLE, m_cycle) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_cycle).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_dccdeny.c b/src/modules/m_dccdeny.c
index de940d57e..73477fee3 100644
--- a/src/modules/m_dccdeny.c
+++ b/src/modules/m_dccdeny.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_dccdeny)
 
 DLLFUNC int MOD_INIT(m_dccdeny)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_DCCDENY, TOK_DCCDENY, m_dccdeny, 2);
+	CommandAdd(modinfo->handle, MSG_DCCDENY, TOK_DCCDENY, m_dccdeny, 2, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_dccdeny)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_dccdeny)(int module_unload)
 {
-	if (del_Command(MSG_DCCDENY, TOK_DCCDENY, m_dccdeny) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_dccdeny).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_dummy.c b/src/modules/m_dummy.c
index f45ed6378..ab5c8ac80 100644
--- a/src/modules/m_dummy.c
+++ b/src/modules/m_dummy.c
@@ -47,9 +47,9 @@ ModuleHeader MOD_HEADER(m_dummy)
 DLLFUNC int MOD_INIT(m_dummy)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_DUMMY, TOK_DUMMY, m_dummy, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_DUMMY, TOK_DUMMY, m_dummy, MAXPARA, M_USER|M_SERVER);
 	return MOD_SUCCESS;
 }
 
@@ -63,11 +63,6 @@ DLLFUNC int MOD_LOAD(m_dummy)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_dummy)(int module_unload)
 {
-	if (del_Command(MSG_DUMMY, TOK_DUMMY, m_dummy) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_dummy).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_eos.c b/src/modules/m_eos.c
index 930667ab3..4a41fb83d 100644
--- a/src/modules/m_eos.c
+++ b/src/modules/m_eos.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_eos)
 
 DLLFUNC int MOD_INIT(m_eos)(ModuleInfo *modinfo)
 {
-	add_CommandX(MSG_EOS, TOK_EOS, m_eos, MAXPARA, M_SERVER);
+	CommandAdd(modinfo->handle, MSG_EOS, TOK_EOS, m_eos, MAXPARA, M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_eos)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_eos)(int module_unload)
 {
-	if (del_Command(MSG_EOS, TOK_EOS, m_eos) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_eos).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_globops.c b/src/modules/m_globops.c
index 5edbfd845..926c7e201 100644
--- a/src/modules/m_globops.c
+++ b/src/modules/m_globops.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_globops)
 
 DLLFUNC int MOD_INIT(m_globops)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_GLOBOPS, TOK_GLOBOPS, m_globops, 1);
+	CommandAdd(modinfo->handle, MSG_GLOBOPS, TOK_GLOBOPS, m_globops, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_globops)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_globops)(int module_unload)
 {
-	if (del_Command(MSG_GLOBOPS, TOK_GLOBOPS, m_globops) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_globops).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_guest.c b/src/modules/m_guest.c
index 92dc0cb9f..eab60b0f3 100644
--- a/src/modules/m_guest.c
+++ b/src/modules/m_guest.c
@@ -63,7 +63,7 @@ ModuleInfo *ModGuestInfo;
 DLLFUNC int MOD_INIT(m_guest)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
 #ifdef GUEST
 	ModGuestInfo = modinfo;
diff --git a/src/modules/m_help.c b/src/modules/m_help.c
index 6624e33e6..adc9169d4 100644
--- a/src/modules/m_help.c
+++ b/src/modules/m_help.c
@@ -61,8 +61,8 @@ ModuleHeader MOD_HEADER(m_help)
 
 DLLFUNC int MOD_INIT(m_help)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_HELP, TOK_HELP, m_help, 1);
-	add_Command(MSG_HELPOP, NULL, m_help, 1);
+	CommandAdd(modinfo->handle, MSG_HELP, TOK_HELP, m_help, 1, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_HELPOP, NULL, m_help, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -74,16 +74,6 @@ DLLFUNC int MOD_LOAD(m_help)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_help)(int module_unload)
 {
-	if (del_Command(MSG_HELP, TOK_HELP, m_help) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_help).name);
-	}
-	if (del_Command(MSG_HELPOP, NULL, m_help) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_help).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_htm.c b/src/modules/m_htm.c
index 29dd19aaa..5831d4d89 100644
--- a/src/modules/m_htm.c
+++ b/src/modules/m_htm.c
@@ -72,7 +72,7 @@ ModuleHeader MOD_HEADER(m_htm)
 DLLFUNC int MOD_TEST(m_htm)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
 	HtmModInfo = modinfo;
 	ConfTest = HookAddEx(HtmModInfo->handle, HOOKTYPE_CONFIGTEST, htm_config_test);
@@ -84,9 +84,9 @@ DLLFUNC int MOD_TEST(m_htm)(ModuleInfo *modinfo)
 DLLFUNC int MOD_INIT(m_htm)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_HTM, TOK_HTM, m_htm, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_HTM, TOK_HTM, m_htm, MAXPARA, M_USER|M_SERVER);
 	ConfRun = HookAddEx(HtmModInfo->handle, HOOKTYPE_CONFIGRUN, htm_config_run);
 	ServerStats = HookAddEx(HtmModInfo->handle, HOOKTYPE_STATS, htm_stats);
 #ifndef NO_FDLIST
@@ -109,11 +109,6 @@ DLLFUNC int MOD_LOAD(m_htm)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_htm)(int module_unload)
 {
-	if (del_Command(MSG_HTM, TOK_HTM, m_htm) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_htm).name);
-	}
 #ifndef NO_FDLIST
 	LockEventSystem();
 	EventDel(e_lcf);
diff --git a/src/modules/m_invite.c b/src/modules/m_invite.c
index cc526fc7e..62401b497 100644
--- a/src/modules/m_invite.c
+++ b/src/modules/m_invite.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_invite)
 
 DLLFUNC int MOD_INIT(m_invite)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_INVITE, TOK_INVITE, m_invite, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_INVITE, TOK_INVITE, m_invite, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_invite)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_invite)(int module_unload)
 {
-	if (del_Command(MSG_INVITE, TOK_INVITE, m_invite) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_invite).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_ison.c b/src/modules/m_ison.c
index d85303565..5fe8f66cc 100644
--- a/src/modules/m_ison.c
+++ b/src/modules/m_ison.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_ison)
 
 DLLFUNC int MOD_INIT(m_ison)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_ISON, TOK_ISON, m_ison, 1);
+	CommandAdd(modinfo->handle, MSG_ISON, TOK_ISON, m_ison, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_ison)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_ison)(int module_unload)
 {
-	if (del_Command(MSG_ISON, TOK_ISON, m_ison) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_ison).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_kick.c b/src/modules/m_kick.c
index ba057c24a..ba4e2952a 100644
--- a/src/modules/m_kick.c
+++ b/src/modules/m_kick.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_kick)
 
 DLLFUNC int MOD_INIT(m_kick)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_KICK, TOK_KICK, m_kick, 3);
+	CommandAdd(modinfo->handle, MSG_KICK, TOK_KICK, m_kick, 3, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_kick)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_kick)(int module_unload)
 {
-	if (del_Command(MSG_KICK, TOK_KICK, m_kick) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_kick).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c
index 451fd738c..93f9acb16 100644
--- a/src/modules/m_kill.c
+++ b/src/modules/m_kill.c
@@ -63,9 +63,9 @@ ModuleHeader MOD_HEADER(m_kill)
 DLLFUNC int MOD_INIT(m_kill)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_KILL, TOK_KILL, m_kill, 2);
+	CommandAdd(modinfo->handle, MSG_KILL, TOK_KILL, m_kill, 2, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -80,11 +80,6 @@ DLLFUNC int MOD_LOAD(m_kill)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_kill)(int module_unload)
 {
-	if (del_Command(MSG_KILL, TOK_KILL, m_kill) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_kill).name);
-	}
 	return MOD_SUCCESS;
 	
 }
diff --git a/src/modules/m_lag.c b/src/modules/m_lag.c
index 4d77b6318..4eddf28f1 100644
--- a/src/modules/m_lag.c
+++ b/src/modules/m_lag.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_lag)
 DLLFUNC int MOD_INIT(m_lag)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_LAG, TOK_LAG, m_lag, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_LAG, TOK_LAG, m_lag, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,13 +78,7 @@ DLLFUNC int MOD_LOAD(m_lag)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_lag)(int module_unload)
 {
-	if (del_Command(MSG_LAG, TOK_LAG, m_lag) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_lag).name);
-	}
 	return MOD_SUCCESS;
-	
 }
 
 /* m_lag (lag measure) - Stskeeps
diff --git a/src/modules/m_links.c b/src/modules/m_links.c
index 5a1ef30a6..a7ffbbc35 100644
--- a/src/modules/m_links.c
+++ b/src/modules/m_links.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_links)
 
 DLLFUNC int MOD_INIT(m_links)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_LINKS, TOK_LINKS, m_links, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_LINKS, TOK_LINKS, m_links, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_links)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_links)(int module_unload)
 {
-	if (del_Command(MSG_LINKS, TOK_LINKS, m_links) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_links).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_list.c b/src/modules/m_list.c
index 0fe5a9f1b..f37ee217e 100644
--- a/src/modules/m_list.c
+++ b/src/modules/m_list.c
@@ -68,7 +68,7 @@ DLLFUNC int MOD_TEST(m_list)(ModuleInfo *modinfo)
 
 DLLFUNC int MOD_INIT(m_list)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_LIST, TOK_LIST, m_list, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_LIST, TOK_LIST, m_list, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -80,11 +80,6 @@ DLLFUNC int MOD_LOAD(m_list)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_list)(int module_unload)
 {
-	if (del_Command(MSG_LIST, TOK_LIST, m_list) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_list).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_locops.c b/src/modules/m_locops.c
index a3f185153..2711ccb0e 100644
--- a/src/modules/m_locops.c
+++ b/src/modules/m_locops.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_locops)
 
 DLLFUNC int MOD_INIT(m_locops)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_LOCOPS, TOK_LOCOPS, m_locops, 1);
+	CommandAdd(modinfo->handle, MSG_LOCOPS, TOK_LOCOPS, m_locops, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_locops)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_locops)(int module_unload)
 {
-	if (del_Command(MSG_LOCOPS, TOK_LOCOPS, m_locops) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_locops).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index d9860c322..24458bb86 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -85,10 +85,10 @@ DLLFUNC int MOD_TEST(m_message)(ModuleInfo *modinfo)
 DLLFUNC int MOD_INIT(m_message)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_CommandX(MSG_PRIVATE, TOK_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS);
-	add_Command(MSG_NOTICE, TOK_NOTICE, m_notice, 2);
+	CommandAdd(modinfo->handle, MSG_PRIVATE, TOK_PRIVATE, m_private, 2, M_USER|M_SERVER|M_RESETIDLE|M_VIRUS);
+	CommandAdd(modinfo->handle, MSG_NOTICE, TOK_NOTICE, m_notice, 2, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 	
@@ -103,16 +103,6 @@ DLLFUNC int MOD_LOAD(m_message)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_message)(int module_unload)
 {
-	if (del_Command(MSG_PRIVATE, TOK_PRIVATE, m_private) < 0)
-	{
-		sendto_realops("Failed to delete command privmsg when unloading %s",
-				MOD_HEADER(m_message).name);
-	}
-	if (del_Command(MSG_NOTICE, TOK_NOTICE, m_notice) < 0)
-	{
-		sendto_realops("Failed to delete command notice when unloading %s",
-				MOD_HEADER(m_message).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_mkpasswd.c b/src/modules/m_mkpasswd.c
index 08d1b67c0..7a019ddce 100644
--- a/src/modules/m_mkpasswd.c
+++ b/src/modules/m_mkpasswd.c
@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_mkpasswd)
 
 DLLFUNC int MOD_INIT(m_mkpasswd)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -74,11 +74,6 @@ DLLFUNC int MOD_LOAD(m_mkpasswd)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_mkpasswd)(int module_unload)
 {
-	if (del_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_mkpasswd).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_nachat.c b/src/modules/m_nachat.c
index 5b54810f4..d66aa9531 100644
--- a/src/modules/m_nachat.c
+++ b/src/modules/m_nachat.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_nachat)
 DLLFUNC int MOD_INIT(m_nachat)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_NACHAT, TOK_NACHAT, m_nachat, 1);
+	CommandAdd(modinfo->handle, MSG_NACHAT, TOK_NACHAT, m_nachat, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_nachat)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_nachat)(int module_unload)
 {
-	if (del_Command(MSG_NACHAT, TOK_NACHAT, m_nachat) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_nachat).name);
-	}
 	return MOD_SUCCESS;
 	
 }
diff --git a/src/modules/m_netinfo.c b/src/modules/m_netinfo.c
index 236c64687..78c916680 100644
--- a/src/modules/m_netinfo.c
+++ b/src/modules/m_netinfo.c
@@ -58,7 +58,7 @@ ModuleHeader MOD_HEADER(m_netinfo)
 
 DLLFUNC int MOD_INIT(m_netinfo)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_NETINFO, TOK_NETINFO, m_netinfo, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_NETINFO, TOK_NETINFO, m_netinfo, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -70,11 +70,6 @@ DLLFUNC int MOD_LOAD(m_netinfo)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_netinfo)(int module_unload)
 {
-	if (del_Command(MSG_NETINFO, TOK_NETINFO, m_netinfo) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_netinfo).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c
index 7f57dd0b7..3e534ea1e 100644
--- a/src/modules/m_oper.c
+++ b/src/modules/m_oper.c
@@ -118,9 +118,9 @@ ModuleHeader MOD_HEADER(m_oper)
 DLLFUNC int MOD_INIT(m_oper)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_OPER, TOK_OPER, m_oper, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_OPER, TOK_OPER, m_oper, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -135,11 +135,6 @@ DLLFUNC int MOD_LOAD(m_oper)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_oper)(int module_unload)
 {
-	if (del_Command(MSG_OPER, TOK_OPER, m_oper) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_oper).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_pass.c b/src/modules/m_pass.c
index acddc7dae..9813c431e 100644
--- a/src/modules/m_pass.c
+++ b/src/modules/m_pass.c
@@ -68,7 +68,7 @@ ModuleHeader MOD_HEADER(m_pass)
 
 DLLFUNC int MOD_INIT(m_pass)(ModuleInfo *modinfo)
 {
-	add_CommandX(MSG_PASS, TOK_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_PASS, TOK_PASS, m_pass, 1, M_UNREGISTERED|M_USER|M_SERVER);
 	CommandAdd(modinfo->handle, MSG_WEBIRC, NULL, m_webirc, MAXPARA, M_UNREGISTERED);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
@@ -81,11 +81,6 @@ DLLFUNC int MOD_LOAD(m_pass)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_pass)(int module_unload)
 {
-	if (del_Command(MSG_PASS, TOK_PASS, m_pass) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_pass).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index 28a758658..f36deaedd 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -66,11 +66,11 @@ ModuleHeader MOD_HEADER(m_pingpong)
 DLLFUNC int MOD_INIT(m_pingpong)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
 	Debug((DEBUG_NOTICE, "INIT"));
-	add_Command(MSG_PING, TOK_PING, m_ping, MAXPARA);
-	add_CommandX(MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS);
+	CommandAdd(modinfo->handle, MSG_PING, TOK_PING, m_ping, MAXPARA, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN|M_VIRUS);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -85,16 +85,6 @@ DLLFUNC int MOD_LOAD(m_pingpong)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_pingpong)(int module_unload)
 {
-	if (del_Command(MSG_PING, TOK_PING, m_ping) < 0)
-	{
-		sendto_realops("Failed to delete command ping when unloading %s",
-				MOD_HEADER(m_pingpong).name);
-	}
-	if (del_Command(MSG_PONG, TOK_PONG, m_pong) < 0)
-	{
-		sendto_realops("Failed to delete command pong when unloading %s",
-				MOD_HEADER(m_pingpong).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_protoctl.c b/src/modules/m_protoctl.c
index 2bafb0926..fb5c1d4f0 100644
--- a/src/modules/m_protoctl.c
+++ b/src/modules/m_protoctl.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_protoctl)
 
 DLLFUNC int MOD_INIT(m_protoctl)(ModuleInfo *modinfo)
 {
-	add_CommandX(MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER);
+	CommandAdd(modinfo->handle, MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl, MAXPARA, M_UNREGISTERED|M_SERVER|M_USER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_protoctl)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_protoctl)(int module_unload)
 {
-	if (del_Command(MSG_PROTOCTL, TOK_PROTOCTL, m_protoctl) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_protoctl).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_quit.c b/src/modules/m_quit.c
index c68be1f1e..425f56f95 100644
--- a/src/modules/m_quit.c
+++ b/src/modules/m_quit.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_quit)
 DLLFUNC int MOD_INIT(m_quit)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_CommandX(MSG_QUIT, TOK_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS);
+	CommandAdd(modinfo->handle, MSG_QUIT, TOK_QUIT, m_quit, 1, M_UNREGISTERED|M_USER|M_VIRUS);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_quit)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_quit)(int module_unload)
 {
-	if (del_Command(MSG_QUIT, TOK_QUIT, m_quit) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_quit).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_rakill.c b/src/modules/m_rakill.c
index 851cb2b11..4341adb87 100644
--- a/src/modules/m_rakill.c
+++ b/src/modules/m_rakill.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_rakill)
 DLLFUNC int MOD_INIT(m_rakill)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_rakill)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_rakill)(int module_unload)
 {
-	if (del_Command(MSG_RAKILL, TOK_RAKILL, m_rakill) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_rakill).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_rping.c b/src/modules/m_rping.c
index c561c973c..140dc1826 100644
--- a/src/modules/m_rping.c
+++ b/src/modules/m_rping.c
@@ -67,10 +67,10 @@ ModuleHeader MOD_HEADER(m_rping)
 DLLFUNC int MOD_INIT(m_rping)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_RPING, TOK_RPING, m_rping, MAXPARA);
-	add_Command(MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_RPING, TOK_RPING, m_rping, MAXPARA, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -85,16 +85,6 @@ DLLFUNC int MOD_LOAD(m_rping)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_rping)(int module_unload)
 {
-	if (del_Command(MSG_RPING, TOK_RPING, m_rping) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_rping).name);
-	}
-	if (del_Command(MSG_RPONG, TOK_RPONG, m_rpong) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_rping).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_rules.c b/src/modules/m_rules.c
index 6653ba865..ba9a8e9b7 100644
--- a/src/modules/m_rules.c
+++ b/src/modules/m_rules.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_rules)
 
 DLLFUNC int MOD_INIT(m_rules)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_RULES, TOK_RULES, m_rules, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_RULES, TOK_RULES, m_rules, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_rules)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_rules)(int module_unload)
 {
-	if (del_Command(MSG_RULES, TOK_RULES, m_rules) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_rules).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sajoin.c b/src/modules/m_sajoin.c
index 24441a5d5..37d6c633a 100644
--- a/src/modules/m_sajoin.c
+++ b/src/modules/m_sajoin.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_sajoin)
 
 DLLFUNC int MOD_INIT(m_sajoin)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SAJOIN, TOK_SAJOIN, m_sajoin, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SAJOIN, TOK_SAJOIN, m_sajoin, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_sajoin)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_sajoin)(int module_unload)
 {
-	if (del_Command(MSG_SAJOIN, TOK_SAJOIN, m_sajoin) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_sajoin).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_samode.c b/src/modules/m_samode.c
index 5467dce96..6163640d2 100644
--- a/src/modules/m_samode.c
+++ b/src/modules/m_samode.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_samode)
 
 DLLFUNC int MOD_INIT(m_samode)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SAMODE, TOK_SAMODE, m_samode, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SAMODE, TOK_SAMODE, m_samode, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_samode)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_samode)(int module_unload)
 {
-	if (del_Command(MSG_SAMODE, TOK_SAMODE, m_samode) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_samode).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sapart.c b/src/modules/m_sapart.c
index 2caf19f4c..cdf1a8fd4 100644
--- a/src/modules/m_sapart.c
+++ b/src/modules/m_sapart.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_sapart)
 
 DLLFUNC int MOD_INIT(m_sapart)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SAPART, TOK_SAPART, m_sapart, 3);
+	CommandAdd(modinfo->handle, MSG_SAPART, TOK_SAPART, m_sapart, 3, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_sapart)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_sapart)(int module_unload)
 {
-	if (del_Command(MSG_SAPART, TOK_SAPART, m_sapart) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_sapart).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c
index 7ed1d17cb..fe30774d7 100644
--- a/src/modules/m_sdesc.c
+++ b/src/modules/m_sdesc.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_sdesc)
 DLLFUNC int MOD_INIT(m_sdesc)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SDESC, TOK_SDESC, m_sdesc, 1);
+	CommandAdd(modinfo->handle, MSG_SDESC, TOK_SDESC, m_sdesc, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -76,11 +76,6 @@ DLLFUNC int MOD_LOAD(m_sdesc)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_sdesc)(int module_unload)
 {
-	if (del_Command(MSG_SDESC, TOK_SDESC, m_sdesc) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_sdesc).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sendsno.c b/src/modules/m_sendsno.c
index b13c49fa5..421197852 100644
--- a/src/modules/m_sendsno.c
+++ b/src/modules/m_sendsno.c
@@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_sendsno)
 /* This is called on module init, before Server Ready */
 DLLFUNC int MOD_INIT(m_sendsno)(ModuleInfo *modinfo)
 {
-	add_CommandX(MSG_SENDSNO, TOK_SENDSNO, m_sendsno, MAXPARA, M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SENDSNO, TOK_SENDSNO, m_sendsno, MAXPARA, M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -75,11 +75,6 @@ DLLFUNC int MOD_LOAD(m_sendsno)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_sendsno)(int module_unload)
 {
-	if (del_Command(MSG_SENDSNO, TOK_SENDSNO, m_sendsno) < 0)
-	{
-		sendto_realops("Failed to delete command sendsno when unloading %s",
-				MOD_HEADER(m_sendsno).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sendumode.c b/src/modules/m_sendumode.c
index 28a99adc1..21b6280ea 100644
--- a/src/modules/m_sendumode.c
+++ b/src/modules/m_sendumode.c
@@ -64,10 +64,10 @@ ModuleHeader MOD_HEADER(m_sendumode)
 DLLFUNC int MOD_INIT(m_sendumode)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA);
-	add_Command(MSG_SMO, TOK_SMO, m_sendumode, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SMO, TOK_SMO, m_sendumode, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -81,19 +81,7 @@ DLLFUNC int MOD_LOAD(m_sendumode)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_sendumode)(int module_unload)
 {
-	if (del_Command(MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode) < 0)
-	{
-		sendto_realops("Failed to delete command sendumode when unloading %s",
-				MOD_HEADER(m_sendumode).name);
-	}
-	if (del_Command(MSG_SMO, TOK_SMO, m_sendumode) < 0)
-	{
-		sendto_realops("Failed to delete command smo when unloading %s",
-				MOD_HEADER(m_sendumode).name);
-	}
 	return MOD_SUCCESS;
-	
-
 }
 
 /*
diff --git a/src/modules/m_server.c b/src/modules/m_server.c
index dbd1df2db..7a58f0781 100644
--- a/src/modules/m_server.c
+++ b/src/modules/m_server.c
@@ -64,7 +64,7 @@ ModuleHeader MOD_HEADER(m_server)
 
 DLLFUNC int MOD_INIT(m_server)(ModuleInfo *modinfo)
 {
-	add_CommandX(MSG_SERVER, TOK_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SERVER, TOK_SERVER, m_server, MAXPARA, M_UNREGISTERED|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -76,11 +76,6 @@ DLLFUNC int MOD_LOAD(m_server)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_server)(int module_unload)
 {
-	if (del_Command(MSG_SERVER, TOK_SERVER, m_server) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_server).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c
index d27702b1f..85a6b4457 100644
--- a/src/modules/m_sethost.c
+++ b/src/modules/m_sethost.c
@@ -63,9 +63,9 @@ ModuleHeader MOD_HEADER(m_sethost)
 DLLFUNC int MOD_INIT(m_sethost)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -77,11 +77,6 @@ DLLFUNC int MOD_LOAD(m_sethost)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_sethost)(int module_unload)
 {
-	if (del_Command(MSG_SETHOST, TOK_SETHOST, m_sethost) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_sethost).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c
index 6d174ce75..4aeccb401 100644
--- a/src/modules/m_setident.c
+++ b/src/modules/m_setident.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_setident)
 DLLFUNC int MOD_INIT(m_setident)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -76,11 +76,6 @@ DLLFUNC int MOD_LOAD(m_setident)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_setident)(int module_unload)
 {
-	if (del_Command(MSG_SETIDENT, TOK_SETIDENT, m_setident) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_setident).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c
index 5c3933963..06a68e4b1 100644
--- a/src/modules/m_setname.c
+++ b/src/modules/m_setname.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_setname)
 DLLFUNC int MOD_INIT(m_setname)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SETNAME, TOK_SETNAME, m_setname, 1);
+	CommandAdd(modinfo->handle, MSG_SETNAME, TOK_SETNAME, m_setname, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -76,11 +76,6 @@ DLLFUNC int MOD_LOAD(m_setname)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_setname)(int module_unload)
 {
-	if (del_Command(MSG_SETNAME, TOK_SETNAME, m_setname) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_setname).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_silence.c b/src/modules/m_silence.c
index 1f34fc391..5eae44af3 100644
--- a/src/modules/m_silence.c
+++ b/src/modules/m_silence.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_silence)
 
 DLLFUNC int MOD_INIT(m_silence)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SILENCE, TOK_SILENCE, m_silence, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SILENCE, TOK_SILENCE, m_silence, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_silence)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_silence)(int module_unload)
 {
-	if (del_Command(MSG_SILENCE, TOK_SILENCE, m_silence) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_silence).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sjoin.c b/src/modules/m_sjoin.c
index 56480e343..b4871acc5 100644
--- a/src/modules/m_sjoin.c
+++ b/src/modules/m_sjoin.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_sjoin)
 
 DLLFUNC int MOD_INIT(m_sjoin)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SJOIN, TOK_SJOIN, m_sjoin, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SJOIN, TOK_SJOIN, m_sjoin, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_sjoin)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_sjoin)(int module_unload)
 {
-	if (del_Command(MSG_SJOIN, TOK_SJOIN, m_sjoin) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_sjoin).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sqline.c b/src/modules/m_sqline.c
index a42393377..a3386ce03 100644
--- a/src/modules/m_sqline.c
+++ b/src/modules/m_sqline.c
@@ -64,9 +64,9 @@ ModuleHeader MOD_HEADER(m_sqline)
 DLLFUNC int MOD_INIT(m_sqline)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -81,11 +81,6 @@ DLLFUNC int MOD_LOAD(m_sqline)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_sqline)(int module_unload)
 {
-	if (del_Command(MSG_SQLINE, TOK_SQLINE, m_sqline) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_sqline).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_squit.c b/src/modules/m_squit.c
index c1cc9c2cd..bd0eb7c83 100644
--- a/src/modules/m_squit.c
+++ b/src/modules/m_squit.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_squit)
 
 DLLFUNC int MOD_INIT(m_squit)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SQUIT, TOK_SQUIT, m_squit, 2);
+	CommandAdd(modinfo->handle, MSG_SQUIT, TOK_SQUIT, m_squit, 2, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_squit)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_squit)(int module_unload)
 {
-	if (del_Command(MSG_SQUIT, TOK_SQUIT, m_squit) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_squit).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_stats.c b/src/modules/m_stats.c
index 3ffed2189..934ba2b94 100644
--- a/src/modules/m_stats.c
+++ b/src/modules/m_stats.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_stats)
 
 DLLFUNC int MOD_INIT(m_stats)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_STATS, TOK_STATS, m_stats, 3);
+	CommandAdd(modinfo->handle, MSG_STATS, TOK_STATS, m_stats, 3, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_stats)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_stats)(int module_unload)
 {
-	if (del_Command(MSG_STATS, TOK_STATS, m_stats) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_stats).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsfline.c b/src/modules/m_svsfline.c
index a6f70607d..e048d39a5 100644
--- a/src/modules/m_svsfline.c
+++ b/src/modules/m_svsfline.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_svsfline)
 
 DLLFUNC int MOD_INIT(m_svsfline)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_svsfline)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svsfline)(int module_unload)
 {
-	if (del_Command(MSG_SVSFLINE, TOK_SVSFLINE, m_svsfline) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_svsfline).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsjoin.c b/src/modules/m_svsjoin.c
index b5080bd4e..64ed63703 100644
--- a/src/modules/m_svsjoin.c
+++ b/src/modules/m_svsjoin.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_svsjoin)
 DLLFUNC int MOD_INIT(m_svsjoin)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_svsjoin)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_svsjoin)(int module_unload)
 {
-	if (del_Command(MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsjoin).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_svskill.c b/src/modules/m_svskill.c
index d9a49f609..45362d2c9 100644
--- a/src/modules/m_svskill.c
+++ b/src/modules/m_svskill.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_svskill)
 DLLFUNC int MOD_INIT(m_svskill)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SVSKILL, TOK_SVSKILL, m_svskill, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSKILL, TOK_SVSKILL, m_svskill, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,11 +79,6 @@ DLLFUNC int MOD_LOAD(m_svskill)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_svskill)(int module_unload)
 {
-	if (del_Command(MSG_SVSKILL, TOK_SVSKILL, m_svskill) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svskill).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svslusers.c b/src/modules/m_svslusers.c
index d7965630f..5a6171d55 100644
--- a/src/modules/m_svslusers.c
+++ b/src/modules/m_svslusers.c
@@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_svslusers)
 
 DLLFUNC int MOD_INIT(m_svslusers)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -73,11 +73,6 @@ DLLFUNC int MOD_LOAD(m_svslusers)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svslusers)(int module_unload)
 {
-	if (del_Command(MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svslusers).name);
-	}
 	return MOD_SUCCESS;
 }
 /*
diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c
index 3dd72bd83..68ad7bce0 100644
--- a/src/modules/m_svsmode.c
+++ b/src/modules/m_svsmode.c
@@ -66,8 +66,8 @@ ModuleHeader MOD_HEADER(m_svsmode)
 
 DLLFUNC int MOD_INIT(m_svsmode)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA);
-	add_Command(MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,11 +79,6 @@ DLLFUNC int MOD_LOAD(m_svsmode)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svsmode)(int module_unload)
 {
-	if (del_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode) < 0 || del_Command(MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsmode).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c
index 1929cba7b..841893341 100644
--- a/src/modules/m_svsmotd.c
+++ b/src/modules/m_svsmotd.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_svsmotd)
 
 DLLFUNC int MOD_INIT(m_svsmotd)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -75,11 +75,6 @@ DLLFUNC int MOD_LOAD(m_svsmotd)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svsmotd)(int module_unload)
 {
-	if (del_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsmotd).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c
index c36038500..b374c115d 100644
--- a/src/modules/m_svsnick.c
+++ b/src/modules/m_svsnick.c
@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_svsnick)
 
 DLLFUNC int MOD_INIT(m_svsnick)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -74,11 +74,6 @@ DLLFUNC int MOD_LOAD(m_svsnick)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svsnick)(int module_unload)
 {
-	if (del_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsnick).name);
-	}
 	return MOD_SUCCESS;
 }
 /*
diff --git a/src/modules/m_svsnline.c b/src/modules/m_svsnline.c
index 9e3ca5033..f0ce7649a 100644
--- a/src/modules/m_svsnline.c
+++ b/src/modules/m_svsnline.c
@@ -65,9 +65,9 @@ ModuleHeader MOD_HEADER(m_svsnline)
 DLLFUNC int MOD_INIT(m_svsnline)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -81,11 +81,6 @@ DLLFUNC int MOD_LOAD(m_svsnline)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_svsnline)(int module_unload)
 {
-	if (del_Command(MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsnline).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsnolag.c b/src/modules/m_svsnolag.c
index 22ab6e4f0..ea171bb12 100644
--- a/src/modules/m_svsnolag.c
+++ b/src/modules/m_svsnolag.c
@@ -62,8 +62,8 @@ ModuleHeader MOD_HEADER(m_svsnolag)
 
 DLLFUNC int MOD_INIT(m_svsnolag)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag, MAXPARA);
-	add_Command(MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag, MAXPARA, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -75,11 +75,6 @@ DLLFUNC int MOD_LOAD(m_svsnolag)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svsnolag)(int module_unload)
 {
-	if (del_Command(MSG_SVSNOLAG, TOK_SVSNOLAG, m_svsnolag) < 0 || del_Command(MSG_SVS2NOLAG, TOK_SVS2NOLAG, m_svs2nolag) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsnolag).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsnoop.c b/src/modules/m_svsnoop.c
index a74c97644..0d3761e9a 100644
--- a/src/modules/m_svsnoop.c
+++ b/src/modules/m_svsnoop.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_svsnoop)
 
 DLLFUNC int MOD_INIT(m_svsnoop)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -75,11 +75,6 @@ DLLFUNC int MOD_LOAD(m_svsnoop)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svsnoop)(int module_unload)
 {
-	if (del_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svsnoop).name);
-	}
 	return MOD_SUCCESS;
 }
 int m_svsnoop(aClient *cptr, aClient *sptr, int parc, char *parv[])
diff --git a/src/modules/m_svso.c b/src/modules/m_svso.c
index 2a2015e29..c4ab46c85 100644
--- a/src/modules/m_svso.c
+++ b/src/modules/m_svso.c
@@ -98,7 +98,7 @@ ModuleHeader MOD_HEADER(m_svso)
 
 DLLFUNC int MOD_INIT(m_svso)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSO, TOK_SVSO, m_svso, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSO, TOK_SVSO, m_svso, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -110,11 +110,6 @@ DLLFUNC int MOD_LOAD(m_svso)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svso)(int module_unload)
 {
-	if (del_Command(MSG_SVSO, TOK_SVSO, m_svso) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svso).name);
-	}
 	return MOD_SUCCESS;
 }
 /*
diff --git a/src/modules/m_svspart.c b/src/modules/m_svspart.c
index 77186ab6a..db90e313b 100644
--- a/src/modules/m_svspart.c
+++ b/src/modules/m_svspart.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_svspart)
 DLLFUNC int MOD_INIT(m_svspart)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SVSPART, TOK_SVSPART, m_svspart, 3);
+	CommandAdd(modinfo->handle, MSG_SVSPART, TOK_SVSPART, m_svspart, 3, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_svspart)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_svspart)(int module_unload)
 {
-	if (del_Command(MSG_SVSPART, TOK_SVSPART, m_svspart) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svspart).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_svssilence.c b/src/modules/m_svssilence.c
index 2bbd58d4c..b0d168f67 100644
--- a/src/modules/m_svssilence.c
+++ b/src/modules/m_svssilence.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_svssilence)
 DLLFUNC int MOD_INIT(m_svssilence)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_svssilence)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_svssilence)(int module_unload)
 {
-	if (del_Command(MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svssilence).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_svssno.c b/src/modules/m_svssno.c
index 6bbdf7d2d..281aaba6f 100644
--- a/src/modules/m_svssno.c
+++ b/src/modules/m_svssno.c
@@ -63,8 +63,8 @@ ModuleHeader MOD_HEADER(m_svssno)
 
 DLLFUNC int MOD_INIT(m_svssno)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SVSSNO, TOK_SVSSNO, m_svssno, MAXPARA);
-	add_Command(MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSSNO, TOK_SVSSNO, m_svssno, MAXPARA, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -76,11 +76,6 @@ DLLFUNC int MOD_LOAD(m_svssno)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_svssno)(int module_unload)
 {
-	if (del_Command(MSG_SVSSNO, TOK_SVSSNO, m_svssno) < 0 || del_Command(MSG_SVS2SNO, TOK_SVS2SNO, m_svs2sno) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svssno).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svswatch.c b/src/modules/m_svswatch.c
index 6abf35656..f16863e9a 100644
--- a/src/modules/m_svswatch.c
+++ b/src/modules/m_svswatch.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_svswatch)
 DLLFUNC int MOD_INIT(m_svswatch)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,11 +79,6 @@ DLLFUNC int MOD_LOAD(m_svswatch)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_svswatch)(int module_unload)
 {
-	if (del_Command(MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_svswatch).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_swhois.c b/src/modules/m_swhois.c
index 86a5952ff..3e6e0de6a 100644
--- a/src/modules/m_swhois.c
+++ b/src/modules/m_swhois.c
@@ -62,7 +62,7 @@ ModuleHeader MOD_HEADER(m_swhois)
 
 DLLFUNC int MOD_INIT(m_swhois)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -74,11 +74,6 @@ DLLFUNC int MOD_LOAD(m_swhois)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_swhois)(int module_unload)
 {
-	if (del_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_swhois).name);
-	}
 	return MOD_SUCCESS;
 }
 /*
diff --git a/src/modules/m_time.c b/src/modules/m_time.c
index d84d5c121..e7d84d985 100644
--- a/src/modules/m_time.c
+++ b/src/modules/m_time.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_time)
 DLLFUNC int MOD_INIT(m_time)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_TIME, TOK_TIME, m_time, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_TIME, TOK_TIME, m_time, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -79,11 +79,6 @@ DLLFUNC int MOD_LOAD(m_time)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_time)(int module_unload)
 {
-	if (del_Command(MSG_TIME, TOK_TIME, m_time) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_time).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index ce9cd0f2c..1047a7b5f 100644
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -141,16 +141,16 @@ DLLFUNC int MOD_INIT(m_tkl)(ModuleInfo *modinfo)
 {
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_GLINE, TOK_GLINE, m_gline, 3);
-	add_Command(MSG_SHUN, TOK_SHUN, m_shun, 3);
-	add_Command(MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun, 2);
-	add_Command(MSG_ZLINE, TOK_NONE, m_tzline, 3);
-	add_Command(MSG_KLINE, TOK_NONE, m_tkline, 3);
-	add_Command(MSG_GZLINE, TOK_NONE, m_gzline, 3);
-	add_Command(MSG_SPAMFILTER, TOK_NONE, m_spamfilter, 6);
-	add_Command(MSG_TKL, TOK_TKL, _m_tkl, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_GLINE, TOK_GLINE, m_gline, 3, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SHUN, TOK_SHUN, m_shun, 3, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun, 2, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_ZLINE, TOK_NONE, m_tzline, 3, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_KLINE, TOK_NONE, m_tkline, 3, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_GZLINE, TOK_NONE, m_gzline, 3, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_SPAMFILTER, TOK_NONE, m_spamfilter, 6, M_USER|M_SERVER);
+	CommandAdd(modinfo->handle, MSG_TKL, TOK_TKL, _m_tkl, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -165,19 +165,6 @@ DLLFUNC int MOD_LOAD(m_tkl)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_tkl)(int module_unload)
 {
-	if ((del_Command(MSG_GLINE, TOK_GLINE, m_gline) < 0) ||
-	    (del_Command(MSG_SHUN, TOK_SHUN, m_shun) < 0 ) ||
-	    (del_Command(MSG_ZLINE, TOK_NONE, m_tzline) < 0) ||
-	    (del_Command(MSG_GZLINE, TOK_NONE, m_gzline) < 0) ||
-	    (del_Command(MSG_KLINE, TOK_NONE, m_tkline) < 0) ||
-	    (del_Command(MSG_SPAMFILTER, TOK_NONE, m_spamfilter) < 0) ||
-	    (del_Command(MSG_TEMPSHUN, TOK_TEMPSHUN, m_tempshun) < 0) ||
-	    (del_Command(MSG_TKL, TOK_TKL, _m_tkl) < 0))
-
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_tkl).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_topic.c b/src/modules/m_topic.c
index ccf69100e..d232888b9 100644
--- a/src/modules/m_topic.c
+++ b/src/modules/m_topic.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_topic)
 
 DLLFUNC int MOD_INIT(m_topic)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_TOPIC, TOK_TOPIC, m_topic, 4);
+	CommandAdd(modinfo->handle, MSG_TOPIC, TOK_TOPIC, m_topic, 4, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_topic)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_topic)(int module_unload)
 {
-	if (del_Command(MSG_TOPIC, TOK_TOPIC, m_topic) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_topic).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_trace.c b/src/modules/m_trace.c
index 688561c5a..77c008c05 100644
--- a/src/modules/m_trace.c
+++ b/src/modules/m_trace.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_trace)
 
 DLLFUNC int MOD_INIT(m_trace)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_TRACE, TOK_TRACE, m_trace, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_TRACE, TOK_TRACE, m_trace, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_trace)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_trace)(int module_unload)
 {
-	if (del_Command(MSG_TRACE, TOK_TRACE, m_trace) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_trace).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_tsctl.c b/src/modules/m_tsctl.c
index 20f80760a..5937e39f6 100644
--- a/src/modules/m_tsctl.c
+++ b/src/modules/m_tsctl.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_tsctl)
 DLLFUNC int MOD_INIT(m_tsctl)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_tsctl)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_tsctl)(int module_unload)
 {
-	if (del_Command(MSG_TSCTL, TOK_TSCTL, m_tsctl) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_tsctl).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_umode2.c b/src/modules/m_umode2.c
index 133c8145f..501d711da 100644
--- a/src/modules/m_umode2.c
+++ b/src/modules/m_umode2.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_umode2)
 
 DLLFUNC int MOD_INIT(m_umode2)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_UMODE2, TOK_UMODE2, m_umode2, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_UMODE2, TOK_UMODE2, m_umode2, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_umode2)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_umode2)(int module_unload)
 {
-	if (del_Command(MSG_UMODE2, TOK_UMODE2, m_umode2) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_umode2).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_undccdeny.c b/src/modules/m_undccdeny.c
index 40d2e4f54..0a9c3fe05 100644
--- a/src/modules/m_undccdeny.c
+++ b/src/modules/m_undccdeny.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_undccdeny)
 
 DLLFUNC int MOD_INIT(m_undccdeny)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_undccdeny)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_undccdeny)(int module_unload)
 {
-	if (del_Command(MSG_UNDCCDENY, TOK_UNDCCDENY, m_undccdeny) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_undccdeny).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c
index 6d80bc7d5..9ea345aad 100644
--- a/src/modules/m_unkline.c
+++ b/src/modules/m_unkline.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_unkline)
 DLLFUNC int MOD_INIT(m_unkline)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_unkline)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_unkline)(int module_unload)
 {
-	if (del_Command(MSG_UNKLINE, TOK_UNKLINE, m_unkline) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_unkline).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_unsqline.c b/src/modules/m_unsqline.c
index d2a904f70..2f58147db 100644
--- a/src/modules/m_unsqline.c
+++ b/src/modules/m_unsqline.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_unsqline)
 DLLFUNC int MOD_INIT(m_unsqline)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_unsqline)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_unsqline)(int module_unload)
 {
-	if (del_Command(MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_unsqline).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c
index 3dd665928..d1440eb7b 100644
--- a/src/modules/m_unzline.c
+++ b/src/modules/m_unzline.c
@@ -62,9 +62,9 @@ ModuleHeader MOD_HEADER(m_unzline)
 DLLFUNC int MOD_INIT(m_unzline)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -78,11 +78,6 @@ DLLFUNC int MOD_LOAD(m_unzline)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_unzline)(int module_unload)
 {
-	if (del_Command(MSG_UNZLINE, TOK_UNZLINE, m_unzline) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_unzline).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_userhost.c b/src/modules/m_userhost.c
index efe318400..506432b00 100644
--- a/src/modules/m_userhost.c
+++ b/src/modules/m_userhost.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_userhost)
 
 DLLFUNC int MOD_INIT(m_userhost)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_USERHOST, TOK_USERHOST, m_userhost, 1);
+	CommandAdd(modinfo->handle, MSG_USERHOST, TOK_USERHOST, m_userhost, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_userhost)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_userhost)(int module_unload)
 {
-	if (del_Command(MSG_USERHOST, TOK_USERHOST, m_userhost) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_userhost).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_vhost.c b/src/modules/m_vhost.c
index 867c70ea4..37bb2be2f 100644
--- a/src/modules/m_vhost.c
+++ b/src/modules/m_vhost.c
@@ -63,9 +63,9 @@ ModuleHeader MOD_HEADER(m_vhost)
 DLLFUNC int MOD_INIT(m_vhost)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -80,11 +80,6 @@ DLLFUNC int MOD_LOAD(m_vhost)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_vhost)(int module_unload)
 {
-	if (del_Command(MSG_VHOST, TOK_VHOST, m_vhost) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_vhost).name);
-	}
 	return MOD_SUCCESS;	
 }
 
diff --git a/src/modules/m_wallops.c b/src/modules/m_wallops.c
index c7ffd72d3..0a24c5c3a 100644
--- a/src/modules/m_wallops.c
+++ b/src/modules/m_wallops.c
@@ -60,7 +60,7 @@ ModuleHeader MOD_HEADER(m_wallops)
 
 DLLFUNC int MOD_INIT(m_wallops)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_WALLOPS, TOK_WALLOPS, m_wallops, 1);
+	CommandAdd(modinfo->handle, MSG_WALLOPS, TOK_WALLOPS, m_wallops, 1, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -72,11 +72,6 @@ DLLFUNC int MOD_LOAD(m_wallops)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_wallops)(int module_unload)
 {
-	if (del_Command(MSG_WALLOPS, TOK_WALLOPS, m_wallops) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_wallops).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_who.c b/src/modules/m_who.c
index 08293d2a1..10f0e0a0a 100644
--- a/src/modules/m_who.c
+++ b/src/modules/m_who.c
@@ -69,9 +69,9 @@ ModuleHeader MOD_HEADER(m_who)
 DLLFUNC int MOD_INIT(m_who)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_WHO, TOK_WHO, m_who, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_WHO, TOK_WHO, m_who, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -86,11 +86,6 @@ DLLFUNC int MOD_LOAD(m_who)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_who)(int module_unload)
 {
-	if (del_Command(MSG_WHO, TOK_WHO, m_who) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_who).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c
index 953c70a98..cfdf9e0bc 100644
--- a/src/modules/m_whois.c
+++ b/src/modules/m_whois.c
@@ -64,9 +64,9 @@ ModuleHeader MOD_HEADER(m_whois)
 DLLFUNC int MOD_INIT(m_whois)(ModuleInfo *modinfo)
 {
 	/*
-	 * We call our add_Command crap here
+	 * We call our CommandAdd crap here
 	*/
-	add_Command(MSG_WHOIS, TOK_WHOIS, m_whois, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_WHOIS, TOK_WHOIS, m_whois, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -80,11 +80,6 @@ DLLFUNC int MOD_LOAD(m_whois)(int module_load)
 /* Called when module is unloaded */
 DLLFUNC int MOD_UNLOAD(m_whois)(int module_unload)
 {
-	if (del_Command(MSG_WHOIS, TOK_WHOIS, m_whois) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-				MOD_HEADER(m_whois).name);
-	}
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_whowas.c b/src/modules/m_whowas.c
index 0d4d7e033..a09950392 100644
--- a/src/modules/m_whowas.c
+++ b/src/modules/m_whowas.c
@@ -61,7 +61,7 @@ ModuleHeader MOD_HEADER(m_whowas)
 
 DLLFUNC int MOD_INIT(m_whowas)(ModuleInfo *modinfo)
 {
-	add_Command(MSG_WHOWAS, TOK_WHOWAS, m_whowas, MAXPARA);
+	CommandAdd(modinfo->handle, MSG_WHOWAS, TOK_WHOWAS, m_whowas, MAXPARA, M_USER|M_SERVER);
 	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
@@ -73,11 +73,6 @@ DLLFUNC int MOD_LOAD(m_whowas)(int module_load)
 
 DLLFUNC int MOD_UNLOAD(m_whowas)(int module_unload)
 {
-	if (del_Command(MSG_WHOWAS, TOK_WHOWAS, m_whowas) < 0)
-	{
-		sendto_realops("Failed to delete commands when unloading %s",
-			MOD_HEADER(m_whowas).name);
-	}
 	return MOD_SUCCESS;
 }