diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
index b8fe9185d1..8e3936489c 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyAgent.java
@@ -67,8 +67,10 @@ protected void onEvent(Event event) {
 						log.debug("Member terminated event received");
 					}
 					MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event;
-					System.out.println("Terminated event :::::::::::::::::::: " +
+					if(log.isDebugEnabled()){
+						log.debug("Terminated event :::::::::::::::::::: " +
 					                   memberTerminatedEvent.getServiceName());
+					}
 					new MetaDataAdmin().removeCartridgeMetaDataDetails("appA", "php");
 
 				} catch (Exception e) {
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
index 2f09d3db4a..fbca388a94 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/listener/TopologyListener.java
@@ -59,8 +59,10 @@ protected void onEvent(Event event) {
 						log.debug("Member terminated event received");
 					}
 					MemberTerminatedEvent memberTerminatedEvent = (MemberTerminatedEvent) event;
-					System.out.println("Terminated event :::::::::::::::::::: " +
-					                   memberTerminatedEvent.getServiceName());
+					if(log.isDebugEnabled()){
+    					log.info("Terminated event :::::::::::::::::::: " +
+    					                   memberTerminatedEvent.getServiceName());
+					}
 					new MetaDataAdmin().removeCartridgeMetaDataDetails("appA", "php");
 
 					// extensionHandler.onMemberTerminatedEvent(memberTerminatedEvent);
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
index 7d5acd038c..054db317b7 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/CarbonRegistry.java
@@ -67,7 +67,7 @@ public CarbonRegistry() {
 	@Override
 	public String addCartridgeMetaDataDetails(String applicationName, String cartridgeType,
 	                                          CartridgeMetaData cartridgeMetaData) throws Exception {
-		System.out.println("Adding meta data details");
+		
 
 		Registry tempRegistry = getGovernanceUserRegistry();
 		try {
@@ -96,24 +96,24 @@ public String addCartridgeMetaDataDetails(String applicationName, String cartrid
 
 			tempRegistry.put(resourcePath, resource);
 
-			System.out.println("A resource added to: " + resourcePath);
-
-			System.out.println(cartridgeMetaData.type);
-			// registry.rateResource(resourcePath, defaultRank);
+			if(log.isDebugEnabled()){
+				log.debug("A resource added to: " + resourcePath);
+			}
 
+		
 			Comment comment = new Comment();
 			comment.setText("Added the " + applicationName + " " + type + " cartridge");
 			// registry.addComment(resourcePath, comment);
 
 		} catch (Exception e) {
-
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("addCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 
 		}
-		System.out.println("Add meta data details");
+		
 		return "success";
 	}
 
@@ -134,10 +134,7 @@ public String getCartridgeMetaDataDetails(String applicationName, String cartrid
 			if (registry.resourceExists(resourcePath)) {
 
 				Resource getResource = registry.get(resourcePath);
-				System.out.println("Resource retrived");
-				System.out.println("Printing retrieved resource content: " +
-				                   new String((byte[]) getResource.getContent()));
-
+			
 				cartridgeMetaData.type = getResource.getProperty("Cartidge Type");
 				cartridgeMetaData.applicationName = getResource.getProperty("Application Name");
 				cartridgeMetaData.description = getResource.getProperty("Description");
@@ -159,8 +156,9 @@ public String getCartridgeMetaDataDetails(String applicationName, String cartrid
 
 		} catch (Exception e) {
 
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("getCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 
diff --git a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
index 080fc60c0b..2d655c95eb 100644
--- a/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
+++ b/components/org.apache.stratos.metadataservice/src/main/java/org/apache/stratos/metadataservice/registry/GRegRegistry.java
@@ -101,7 +101,7 @@ private static WSRegistryServiceClient setRegistry() throws Exception {
 	@Override
 	public String addCartridgeMetaDataDetails(String applicationName, String cartridgeType,
 	                                          CartridgeMetaData cartridgeMetaData) throws Exception {
-		System.out.println("Adding meta data details");
+	
 		Registry registry = setRegistry();
 		try {
 
@@ -129,9 +129,7 @@ public String addCartridgeMetaDataDetails(String applicationName, String cartrid
 
 			registry.put(resourcePath, resource);
 
-			System.out.println("A resource added to: " + resourcePath);
-
-			System.out.println(cartridgeMetaData.type);
+				
 			registry.rateResource(resourcePath, defaultRank);
 
 			Comment comment = new Comment();
@@ -140,13 +138,14 @@ public String addCartridgeMetaDataDetails(String applicationName, String cartrid
 
 		} catch (Exception e) {
 
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("addCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 			((WSRegistryServiceClient) registry).logut();
 		}
-		System.out.println("Add meta data details");
+	
 		return "success";
 	}
 
@@ -167,9 +166,11 @@ public String getCartridgeMetaDataDetails(String applicationName, String cartrid
 			if (registry.resourceExists(resourcePath)) {
 
 				Resource getResource = registry.get(resourcePath);
-				System.out.println("Resource retrived");
-				System.out.println("Printing retrieved resource content: " +
-				                   new String((byte[]) getResource.getContent()));
+				if(log.isDebugEnabled()){
+    				log.debug("Resource retrived");
+    				log.debug("Printing retrieved resource content: " +
+    				                   new String((byte[]) getResource.getContent()));
+				}
 
 				cartridgeMetaData.type = getResource.getProperty("Cartidge Type");
 				cartridgeMetaData.applicationName = getResource.getProperty("Application Name");
@@ -192,8 +193,9 @@ public String getCartridgeMetaDataDetails(String applicationName, String cartrid
 
 		} catch (Exception e) {
 
-			System.out.println(e.getMessage());
-			e.printStackTrace();
+			if (log.isErrorEnabled()) {
+				log.error("getCartridgeMetaDataDetails", e);
+			}
 		} finally {
 			// Close the session
 			((WSRegistryServiceClient) registry).logut();
diff --git a/components/pom.xml b/components/pom.xml
index 15d0ee539d..0b41eb7a4b 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -102,6 +102,8 @@
         <module>org.apache.stratos.rest.endpoint</module>
         <!-- Stratos manager styles bundle -->
         <module>org.apache.stratos.manager.styles</module>
+		
+		<module>org.apache.stratos.metadataservice</module>
 	
     </modules>
 	    
diff --git a/features/manager/pom.xml b/features/manager/pom.xml
index 0a0fbdb0a7..9426ad0f26 100644
--- a/features/manager/pom.xml
+++ b/features/manager/pom.xml
@@ -48,6 +48,7 @@
         <module>logging-mgt</module>
         <module>rest-endpoint/org.apache.stratos.rest.endpoint.feature</module>
         <module>styles/org.apache.stratos.manager.styles.feature</module>
+        <module>metadataservice/org.apache.stratos.metadataservice.feature</module>
     </modules>
 
     <properties>