diff --git a/config.tgz b/config.tgz
index 5c3a843e..26191871 100644
Binary files a/config.tgz and b/config.tgz differ
diff --git a/modules-targeted.conf b/modules-targeted.conf
index fdc539d5..a2c7c8ce 100644
--- a/modules-targeted.conf
+++ b/modules-targeted.conf
@@ -67,6 +67,13 @@ collectd = module
 # 
 colord = module
 
+# Layer: services
+# Module: couchdb
+#
+# Apache CouchDB database server
+# 
+couchdb = module
+
 # Layer: apps
 # Module: cpufreqselector 
 #
@@ -194,6 +201,13 @@ automount = module
 # 
 avahi = module
 
+# Layer: services
+# Module: bcfg2
+#
+# Configuration management server
+#
+bcfg2 = module
+
 # Layer: services
 # Module: boinc
 #
@@ -723,13 +737,6 @@ hddtemp = module
 # 
 passenger = module
 
-# Layer: admin
-# Module: permissivedomains 
-#
-# Contains all permissivedomains shipped by distribution
-# 
-permissivedomains = module
-
 # Layer: services
 # Module: policykit
 #
@@ -758,6 +765,20 @@ ptchown = module
 # 
 psad = module
 
+# Layer: apps
+# Module: pwauth
+#
+#  External plugin for mod_authnz_external authenticator
+# 
+pwauth = module
+
+# Layer: services
+# Module: quantum
+#
+# Quantum is a virtual network service for Openstack
+# 
+quantum = module
+
 # Layer: system
 # Module: hostname
 #
@@ -835,7 +856,6 @@ icecast = module
 # 
 i18n_input = off
 
-
 # Layer: services
 # Module: jabber
 #
@@ -843,6 +863,13 @@ i18n_input = off
 # 
 jabber = module
 
+# Layer: services
+# Module: jetty
+#
+# Java based http server
+# 
+jetty = module
+
 # Layer: admin
 # Module: kdump
 #
@@ -2369,6 +2396,13 @@ milter = module
 #
 keyboardd = module
 
+# Layer: services
+# Module: keystone
+#
+#  openstack-keystone
+#
+keystone = module
+
 # Layer: services
 # Module: firewalld
 #
@@ -2439,6 +2473,13 @@ sblim = module
 #
 cfengine = module
 
+# Layer: services
+# Module: pacemaker
+#
+# pacemaker
+#
+pacemaker = module
+
 # Layer: services
 # Module: polipo
 #
@@ -2480,3 +2521,38 @@ obex = module
 #  policy for grindengine MPI jobs
 #
 sge = module
+
+# Layer: apps
+# Module: jockey
+# 
+#  policy for jockey-backend
+#
+jockey = module
+
+# Layer: services
+# Module: numad
+# 
+#  numad - user-level daemon that provides advice and managment for optimum use of CPUs and memory on systems with NUMA topology
+#
+numad = module
+
+# Layer: services
+# Module: condor
+# 
+#  policy for condor
+# 
+condor = module 
+
+# Layer: services
+# Module: svnserve
+#  
+#  policy for subversion service
+# 
+svnserve =  module
+
+# Layer: apps
+# Module: man2html
+#  
+#  policy for man2html apps
+# 
+man2html =  module