diff --git a/csst_common/dfs.py b/csst_common/dfs.py
index 7c2c063569a03bd6f723adb885ce96ca7ad43b22..86edb0347a7d60dfb24f885869c203b7356b830c 100644
--- a/csst_common/dfs.py
+++ b/csst_common/dfs.py
@@ -12,14 +12,15 @@ Modified-History:
 """
 
 from csst_dfs_api.common.catalog import CatalogApi
-from csst_dfs_api.facility.level0 import Level0DataApi
-from csst_dfs_api.facility.level0prc import Level0PrcApi
-from csst_dfs_api.facility.level1 import Level1DataApi
-from csst_dfs_api.facility.level1prc import Level1PrcApi
-from csst_dfs_api.facility.otherdata import OtherDataApi
-from csst_dfs_api.mbi import Level2CoApi
-from csst_dfs_api.mbi.level2 import Level2DataApi as MbiLevel2DataApi
-from csst_dfs_api.sls.level2spectra import Level2SpectraApi as SlsLevel2DataApi
+from csst_dfs_api.facility import (
+    Level0DataApi,
+    Level0PrcApi,
+    Level1DataApi,
+    Level1PrcApi,
+    Level2DataApi,
+    Level2TypeApi,
+    OtherDataApi,
+)
 
 
 class DFS:
@@ -44,16 +45,8 @@ class DFS:
         return Level1PrcApi()
 
     @property
-    def L2MbiDataApi(self):
-        return MbiLevel2DataApi()
-
-    @property
-    def L2MbiCoDataApi(self):
-        return Level2CoApi()
-
-    @property
-    def L2SlsDataApi(self):
-        return SlsLevel2DataApi()
+    def L2DataApi(self):
+        return Level2DataApi()
 
     @property
     def OtherDataApi(self):