diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index c63aa0c047a..7d3e1772bca 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -99,7 +99,7 @@
 
     </management-server>
 
-    <configuration-server class="com.cloud.server.ConfigurationServerImpl">
+    <configuration-server class="com.cloud.server.ConfigurationServerImpl" library="com.cloud.configuration.ConfigurationCompoentLibrary">
         <dao name="Configuration configuration server" class="com.cloud.configuration.dao.ConfigurationDaoImpl" singleton="false">
              <param name="premium">false</param>
         </dao>
diff --git a/server/src/com/cloud/configuration/ConfigurationCompoentLibrary.java b/server/src/com/cloud/configuration/ConfigurationCompoentLibrary.java
new file mode 100644
index 00000000000..5d1b0cb07ec
--- /dev/null
+++ b/server/src/com/cloud/configuration/ConfigurationCompoentLibrary.java
@@ -0,0 +1,47 @@
+package com.cloud.configuration;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.cloud.upgrade.DatabaseUpgradeChecker;
+import com.cloud.utils.component.Adapter;
+import com.cloud.utils.component.ComponentLibraryBase;
+import com.cloud.utils.component.Manager;
+import com.cloud.utils.component.SystemIntegrityChecker;
+import com.cloud.utils.component.ComponentLocator.ComponentInfo;
+import com.cloud.utils.db.GenericDao;
+
+public class ConfigurationCompoentLibrary extends ComponentLibraryBase {
+
+    @Override
+    public List<SystemIntegrityChecker> getSystemIntegrityCheckers() {
+        ArrayList<SystemIntegrityChecker> checkers = new ArrayList<SystemIntegrityChecker>();
+        checkers.add(new DatabaseUpgradeChecker());
+        return checkers;
+    }
+
+    @Override
+    public Map<String, ComponentInfo<GenericDao<?, ?>>> getDaos() {
+        return new LinkedHashMap<String, ComponentInfo<GenericDao<?, ? extends Serializable>>>(0);
+    }
+
+    @Override
+    public Map<String, ComponentInfo<Manager>> getManagers() {
+        return new LinkedHashMap<String, ComponentInfo<Manager>>(0);
+    }
+
+    @Override
+    public Map<String, List<ComponentInfo<Adapter>>> getAdapters() {
+        return  new LinkedHashMap<String, List<ComponentInfo<Adapter>>>(0);
+    }
+
+    @Override
+    public Map<Class<?>, Class<?>> getFactories() {
+        return new HashMap<Class<?>, Class<?>>(0);
+    }
+
+}