diff --git a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/mapping/service/impl/StaticDatabaseMappingService.java b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/mapping/service/impl/StaticDatabaseMappingService.java
index 75b1eae3a..60ae89d2a 100644
--- a/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/mapping/service/impl/StaticDatabaseMappingService.java
+++ b/waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/mapping/service/impl/StaticDatabaseMappingService.java
@@ -85,6 +85,11 @@ public StaticDatabaseMappingService(
       QueryMapping queryMapping) {
     this.metaStoreMappingFactory = metaStoreMappingFactory;
     this.queryMapping = queryMapping;
+    mappingsByMetaStoreName = Collections.synchronizedMap(new LinkedHashMap<>());
+    mappingsByDatabaseName = Collections.synchronizedMap(new LinkedHashMap<>());
+    databaseMappingToDatabaseList = new ConcurrentHashMap<>();
+    databaseToTableAllowList = new ConcurrentHashMap<>();
+
     primaryDatabasesCache = CacheBuilder
         .newBuilder()
         .expireAfterAccess(1, TimeUnit.MINUTES)
@@ -94,17 +99,14 @@ public StaticDatabaseMappingService(
           @Override
           public List<String> load(String key) throws Exception {
             if (primaryDatabaseMapping != null) {
-              return primaryDatabaseMapping.getClient().get_all_databases();
+              return new StaticDatabaseMappingPanopticOperationHandler()
+                  .getPrimaryAllDatabases();
             } else {
               return Lists.newArrayList();
             }
           }
         });
 
-    mappingsByMetaStoreName = Collections.synchronizedMap(new LinkedHashMap<>());
-    mappingsByDatabaseName = Collections.synchronizedMap(new LinkedHashMap<>());
-    databaseMappingToDatabaseList = new ConcurrentHashMap<>();
-    databaseToTableAllowList = new ConcurrentHashMap<>();
     for (AbstractMetaStore federatedMetaStore : initialMetastores) {
       add(federatedMetaStore);
     }
@@ -363,47 +365,64 @@ private boolean databaseAndTableAllowed(String database, String table, DatabaseM
 
   @Override
   public PanopticOperationHandler getPanopticOperationHandler() {
-    return new PanopticOperationHandler() {
+    return new StaticDatabaseMappingPanopticOperationHandler();
+  }
 
-      @Override
-      public List<TableMeta> getTableMeta(String db_patterns, String tbl_patterns, List<String> tbl_types) {
+  class StaticDatabaseMappingPanopticOperationHandler extends PanopticOperationHandler {
 
-        BiFunction<TableMeta, DatabaseMapping, Boolean> filter = (tableMeta, mapping) ->
-            databaseAndTableAllowed(tableMeta.getDbName(), tableMeta.getTableName(), mapping);
+    @Override
+    public List<TableMeta> getTableMeta(String db_patterns, String tbl_patterns,
+        List<String> tbl_types) {
 
-        Map<DatabaseMapping, String> mappingsForPattern = new LinkedHashMap<>();
-        for (DatabaseMapping mapping : getAvailableDatabaseMappings()) {
-          mappingsForPattern.put(mapping, db_patterns);
-        }
-        return super.getTableMeta(tbl_patterns, tbl_types, mappingsForPattern, filter);
+      BiFunction<TableMeta, DatabaseMapping, Boolean> filter = (tableMeta, mapping) ->
+          databaseAndTableAllowed(tableMeta.getDbName(), tableMeta.getTableName(), mapping);
+
+      Map<DatabaseMapping, String> mappingsForPattern = new LinkedHashMap<>();
+      for (DatabaseMapping mapping : getAvailableDatabaseMappings()) {
+        mappingsForPattern.put(mapping, db_patterns);
       }
+      return super.getTableMeta(tbl_patterns, tbl_types, mappingsForPattern, filter);
+    }
 
-      @Override
-      public List<String> getAllDatabases(String pattern) {
-        BiFunction<String, DatabaseMapping, Boolean> filter = (database, mapping) -> mappingsByDatabaseName
-            .containsKey(database);
+    @Override
+    public List<String> getAllDatabases(String pattern) {
+      BiFunction<String, DatabaseMapping, Boolean> filter = getFilter();
 
-        BiFunction<String, DatabaseMapping, Boolean> filter1 = (database, mapping) -> filter.apply(database, mapping)
-                && databaseMappingToDatabaseList.get(mapping.getMetastoreMappingName()).contains(database);
+      Map<DatabaseMapping, String> mappingsForPattern = new LinkedHashMap<>();
+      for (DatabaseMapping mapping : getAllDatabaseMappings()) {
+        mappingsForPattern.put(mapping, pattern);
+      }
 
-        Map<DatabaseMapping, String> mappingsForPattern = new LinkedHashMap<>();
-        for (DatabaseMapping mapping : getAllDatabaseMappings()) {
-          mappingsForPattern.put(mapping, pattern);
-        }
+      return super.getAllDatabases(mappingsForPattern, filter);
+    }
 
-        return super.getAllDatabases(mappingsForPattern, filter1);
-      }
+    private BiFunction<String, DatabaseMapping, Boolean> getFilter() {
+      BiFunction<String, DatabaseMapping, Boolean> filter =
+          (database, mapping) -> mappingsByDatabaseName.containsKey(database);
 
-      @Override
-      public List<String> getAllDatabases() {
-        return new ArrayList<>(mappingsByDatabaseName.keySet());
-      }
+      return (database, mapping) -> filter.apply(database, mapping)
+          && databaseMappingToDatabaseList.get(mapping.getMetastoreMappingName())
+          .contains(database);
+    }
 
-      @Override
-      protected PanopticOperationExecutor getPanopticOperationExecutor() {
-        return new PanopticConcurrentOperationExecutor();
-      }
-    };
+    @Override
+    public List<String> getAllDatabases() {
+      return new ArrayList<>(mappingsByDatabaseName.keySet());
+    }
+
+    public List<String> getPrimaryAllDatabases() {
+      BiFunction<String, DatabaseMapping, Boolean> filter = getFilter();
+
+      Map<DatabaseMapping, String> mappingsForPattern = new LinkedHashMap<>();
+      mappingsForPattern.put(primaryDatabaseMapping, "*");
+
+      return super.getAllDatabases(mappingsForPattern, filter);
+    }
+
+    @Override
+    protected PanopticOperationExecutor getPanopticOperationExecutor() {
+      return new PanopticConcurrentOperationExecutor();
+    }
   }
 
   @Override