diff --git a/provider/indexer-ibm/pom.xml b/provider/indexer-ibm/pom.xml
index 72a4dd2724e81e0b50e1425cd78bd58c05521b0f..f0a2b0187ca1b35981b09d1fe9e53b3467598c6c 100644
--- a/provider/indexer-ibm/pom.xml
+++ b/provider/indexer-ibm/pom.xml
@@ -50,7 +50,7 @@
    		<dependency>
    			<groupId>org.opengroup.osdu</groupId>
    			<artifactId>os-core-lib-ibm</artifactId>
-   			<version>0.1.2</version>
+   			<version>0.0.9-SNAPSHOT</version>
    		</dependency>
 
         <dependency>
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java
index 2e828556cb0e4b0c715bd733ebc458530bf65292..55d199f40f4e1bfc740f4b92ce9c2a9b4eb31546 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/di/TenantFactoryImpl.java
@@ -15,7 +15,6 @@
 package org.opengroup.osdu.indexer.ibm.di;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -26,7 +25,7 @@ import javax.annotation.PostConstruct;
 import org.opengroup.osdu.core.common.model.core.ICache;
 import org.opengroup.osdu.core.common.model.core.ITenantFactory;
 import org.opengroup.osdu.core.common.model.core.TenantInfo;
-import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
+import org.opengroup.osdu.core.ibm.cloudant.ICloudantFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,16 +41,13 @@ public class TenantFactoryImpl implements ITenantFactory {
 	private static final Logger logger = LoggerFactory.getLogger(TenantFactoryImpl.class);
 	
 	@Autowired
-	private IBMCloudantClientFactory cloudantFactory;
+	private ICloudantFactory cloudantFactory;
 	private Database db;
+	public static final String DB_NAME = "TenantInfo";
 	
     @PostConstruct
     public void init(){
-        try {
-			db = cloudantFactory.getClient().database(TenantInfoDoc.DB_NAME, true);
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		}
+        db = cloudantFactory.getDatabase(DB_NAME);
     }
 	
 
@@ -110,5 +106,6 @@ public class TenantFactoryImpl implements ITenantFactory {
             ti.setServiceAccount(doc.getServiceprincipalAppId());
             this.tenants.put(tenantName, ti) ;
         });
+		
     }
 }
diff --git a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
index bc199c27e88c030f7804b7c7c62d75f0fd44097f..0566cd4e401e6feac023e3c6a0e569671a753ec8 100644
--- a/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
+++ b/provider/indexer-ibm/src/main/java/org/opengroup/osdu/indexer/ibm/persistence/ElasticSettingSchemaRepositoryImpl.java
@@ -15,15 +15,16 @@
 package org.opengroup.osdu.indexer.ibm.persistence;
 
 import javax.annotation.PostConstruct;
+import javax.inject.Inject;
 
-import org.opengroup.osdu.core.ibm.cloudant.IBMCloudantClientFactory;
+
+import org.opengroup.osdu.core.ibm.cloudant.ICloudantFactory;
 import org.opengroup.osdu.indexer.ibm.model.ElasticSettingSchema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
-import com.cloudant.client.api.CloudantClient;
 import com.cloudant.client.api.Database;
 
 
@@ -40,31 +41,37 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
 	private String dbNamePrefix;
 	
 	private Database db;
+	
+	@Inject
+	private ICloudantFactory cloudantFactory;
 
     @PostConstruct
     public void init(){
         try {
-        	IBMCloudantClientFactory iccFactory = new IBMCloudantClientFactory(url, apiKey);
-			CloudantClient cloudant = iccFactory.getClient();
-			System.out.println("dbNamePrefix: " + dbNamePrefix);
-			if (dbNamePrefix.charAt(dbNamePrefix.length() - 1) == '-') {
-				dbNamePrefix = dbNamePrefix.substring(0, dbNamePrefix.length()-1);
-			}
-			String dbFullName = dbNamePrefix.toLowerCase() + "-" + ElasticSettingsDoc.DB_NAME.toLowerCase();
-			System.out.println("dbFullName: " + dbFullName);
-			db = cloudant.database(dbFullName, true);
+        	db = cloudantFactory.getDatabase("SearchSettings");
+        	//ICloudantFactory iccFactory = new ICloudantFactory(url, apiKey);
+			/*
+			 * CloudantClient cloudant = iccFactory.getClient();
+			 * System.out.println("dbNamePrefix: " + dbNamePrefix); if
+			 * (dbNamePrefix.charAt(dbNamePrefix.length() - 1) == '-') { dbNamePrefix =
+			 * dbNamePrefix.substring(0, dbNamePrefix.length()-1); } String dbFullName =
+			 * dbNamePrefix.toLowerCase() + "-" + ElasticSettingsDoc.DB_NAME.toLowerCase();
+			 * System.out.println("dbFullName: " + dbFullName); db =
+			 * cloudant.database(dbFullName, true);
+			 */
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
     }
 	
-    @Override
-    public void add(ElasticSettingSchema schema, String id) {
-        ElasticSettingsDoc sd = new ElasticSettingsDoc();
-        sd.setId(id);
-        sd.setSettingSchema(schema);
-        db.save(sd);
-    }
+	@Override 
+	public void add(ElasticSettingSchema schema, String id) {
+	  ElasticSettingsDoc sd = new ElasticSettingsDoc(); sd.setId(id);
+	  sd.setSettingSchema(schema);
+	  db.save(sd);
+	  
+	}
+	 
 
     @Override
     public ElasticSettingSchema get(String id) {
@@ -84,4 +91,5 @@ public class ElasticSettingSchemaRepositoryImpl implements ISchemaRepository {
         
      
     }
+
 }