diff --git a/apps/irc/irc.yaml b/apps/irc/irc.yaml
index 9163347..bc95b28 100644
--- a/apps/irc/irc.yaml
+++ b/apps/irc/irc.yaml
@@ -228,9 +228,74 @@ data:
     }
 
     module { name = "enc_sha256" }
-    module { name = "db_flatfile" }
 
-    module { name = "nickserv" }
+    /* Service pseudo-client definitions */
+    service
+    {
+    	nick = "NickServ"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "Nickname Registration Service"
+    }
+
+    service
+    {
+    	nick = "ChanServ"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "Channel Registration Service"
+    }
+
+    service
+    {
+    	nick = "OperServ"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "Operator Service"
+    }
+
+    service
+    {
+    	nick = "BotServ"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "Bot Service"
+    }
+
+    service
+    {
+    	nick = "HostServ"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "vHost Service"
+    }
+
+    service
+    {
+    	nick = "MemoServ"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "Memo Service"
+    }
+
+    service
+    {
+    	nick = "Global"
+    	user = "services"
+    	host = "services.host"
+    	gecos = "Global Noticer"
+    }
+
+    /* Module configurations */
+    module
+    {
+    	name = "nickserv"
+    	client = "NickServ"
+    	defaults = "kill_quick ns_secure ns_private hide_email"
+    	registration = "none"
+    	expire = 90d
+    }
+
     module { name = "ns_identify" }
     module { name = "ns_register" }
     module { name = "ns_set" }
@@ -241,7 +306,14 @@ data:
     module { name = "ns_access" }
     module { name = "ns_group" }
 
-    module { name = "chanserv" }
+    module
+    {
+    	name = "chanserv"
+    	client = "ChanServ"
+    	defaults = "keeptopic peace cs_secure"
+    	expire = 14d
+    }
+
     module { name = "cs_register" }
     module { name = "cs_set" }
     module { name = "cs_access" }
@@ -253,7 +325,12 @@ data:
     module { name = "cs_list" }
     module { name = "cs_drop" }
 
-    module { name = "operserv" }
+    module
+    {
+    	name = "operserv"
+    	client = "OperServ"
+    }
+
     module { name = "os_akill" }
     module { name = "os_mode" }
     module { name = "os_kick" }
@@ -263,72 +340,45 @@ data:
     module { name = "os_reload" }
     module { name = "os_shutdown" }
 
-    module { name = "botserv" }
+    module
+    {
+    	name = "botserv"
+    	client = "BotServ"
+    	defaults = "dontkickops fantasy greet"
+    }
+
     module { name = "bs_bot" }
     module { name = "bs_assign" }
 
-    module { name = "hostserv" }
+    module
+    {
+    	name = "hostserv"
+    	client = "HostServ"
+    }
+
     module { name = "hs_set" }
     module { name = "hs_request" }
 
-    module { name = "memoserv" }
+    module
+    {
+    	name = "memoserv"
+    	client = "MemoServ"
+    	maxmemos = 20
+    }
+
     module { name = "ms_send" }
     module { name = "ms_read" }
     module { name = "ms_del" }
     module { name = "ms_list" }
 
-    module { name = "global" }
-    module { name = "gl_global" }
-
-    nickserv
+    module
     {
-    	nick = "NickServ"
-    	client = "NickServ"
-    	defaults = "kill_quick ns_secure ns_private hide_email"
-    	registration = "none"
-    	expire = 90d
-    }
-
-    chanserv
-    {
-    	nick = "ChanServ"
-    	client = "ChanServ"
-    	defaults = "keeptopic peace cs_secure"
-    	expire = 14d
-    }
-
-    operserv
-    {
-    	nick = "OperServ"
-    	client = "OperServ"
-    }
-
-    botserv
-    {
-    	nick = "BotServ"
-    	client = "BotServ"
-    	defaults = "dontkickops fantasy greet"
-    }
-
-    hostserv
-    {
-    	nick = "HostServ"
-    	client = "HostServ"
-    }
-
-    memoserv
-    {
-    	nick = "MemoServ"
-    	client = "MemoServ"
-    	maxmemos = 20
-    }
-
-    global
-    {
-    	nick = "Global"
+    	name = "global"
     	client = "Global"
     }
 
+    module { name = "gl_global" }
+
     opertype
     {
     	name = "Services Root"
@@ -342,8 +392,9 @@ data:
     	type = "Services Root"
     }
 
-    db_flatfile
+    module
     {
+    	name = "db_flatfile"
     	database = "/anope/data/anope.db"
     	fork = no
     }