diff --git a/extensions/metrics-cluster-feature/renderer.tsx b/extensions/metrics-cluster-feature/renderer.tsx
index ea8a666103..030228d50c 100644
--- a/extensions/metrics-cluster-feature/renderer.tsx
+++ b/extensions/metrics-cluster-feature/renderer.tsx
@@ -1,9 +1,9 @@
-import { LensRendererExtension, Store, Interface, Component } from "@k8slens/extensions";
+import { LensRendererExtension, Interface, Component, Catalog} from "@k8slens/extensions";
 import { MetricsFeature } from "./src/metrics-feature";
 
 export default class ClusterMetricsFeatureExtension extends LensRendererExtension {
   onActivate() {
-    const category = Store.catalogCategories.getForGroupKind<Store.KubernetesClusterCategory>("entity.k8slens.dev", "KubernetesCluster");
+    const category = Catalog.catalogCategories.getForGroupKind<Catalog.KubernetesClusterCategory>("entity.k8slens.dev", "KubernetesCluster");
 
     if (!category) {
       return;
@@ -12,7 +12,7 @@ export default class ClusterMetricsFeatureExtension extends LensRendererExtensio
     category.on("contextMenuOpen", this.clusterContextMenuOpen.bind(this));
   }
 
-  async clusterContextMenuOpen(cluster: Store.KubernetesCluster, ctx: Interface.CatalogEntityContextMenuContext) {
+  async clusterContextMenuOpen(cluster: Catalog.KubernetesCluster, ctx: Interface.CatalogEntityContextMenuContext) {
     if (!cluster.status.active) {
       return;
     }
diff --git a/extensions/metrics-cluster-feature/src/metrics-feature.ts b/extensions/metrics-cluster-feature/src/metrics-feature.ts
index 2f830ae92e..747d6030dc 100644
--- a/extensions/metrics-cluster-feature/src/metrics-feature.ts
+++ b/extensions/metrics-cluster-feature/src/metrics-feature.ts
@@ -1,4 +1,4 @@
-import { ClusterFeature, Store, K8sApi } from "@k8slens/extensions";
+import { ClusterFeature, Catalog, K8sApi } from "@k8slens/extensions";
 import semver from "semver";
 import * as path from "path";
 
@@ -49,7 +49,7 @@ export class MetricsFeature extends ClusterFeature.Feature {
     storageClass: null,
   };
 
-  async install(cluster: Store.KubernetesCluster): Promise<void> {
+  async install(cluster: Catalog.KubernetesCluster): Promise<void> {
     // Check if there are storageclasses
     const storageClassApi = K8sApi.forCluster(cluster, K8sApi.StorageClass);
     const scs = await storageClassApi.list();
@@ -62,11 +62,11 @@ export class MetricsFeature extends ClusterFeature.Feature {
     super.applyResources(cluster, path.join(__dirname, "../resources/"));
   }
 
-  async upgrade(cluster: Store.KubernetesCluster): Promise<void> {
+  async upgrade(cluster: Catalog.KubernetesCluster): Promise<void> {
     return this.install(cluster);
   }
 
-  async updateStatus(cluster: Store.KubernetesCluster): Promise<ClusterFeature.FeatureStatus> {
+  async updateStatus(cluster: Catalog.KubernetesCluster): Promise<ClusterFeature.FeatureStatus> {
     try {
       const statefulSet = K8sApi.forCluster(cluster, K8sApi.StatefulSet);
       const prometheus = await statefulSet.get({name: "prometheus", namespace: "lens-metrics"});
@@ -87,7 +87,7 @@ export class MetricsFeature extends ClusterFeature.Feature {
     return this.status;
   }
 
-  async uninstall(cluster: Store.KubernetesCluster): Promise<void> {
+  async uninstall(cluster: Catalog.KubernetesCluster): Promise<void> {
     const namespaceApi = K8sApi.forCluster(cluster, K8sApi.Namespace);
     const clusterRoleBindingApi = K8sApi.forCluster(cluster, K8sApi.ClusterRoleBinding);
     const clusterRoleApi = K8sApi.forCluster(cluster, K8sApi.ClusterRole);
diff --git a/extensions/telemetry/src/tracker.ts b/extensions/telemetry/src/tracker.ts
index 76b046f63b..9a2ad9d7ea 100644
--- a/extensions/telemetry/src/tracker.ts
+++ b/extensions/telemetry/src/tracker.ts
@@ -1,4 +1,4 @@
-import { EventBus, Util, Store, App } from "@k8slens/extensions";
+import { EventBus, Util, Catalog, App } from "@k8slens/extensions";
 import ua from "universal-analytics";
 import Analytics from "analytics-node";
 import { machineIdSync } from "node-machine-id";
@@ -102,7 +102,7 @@ export class Tracker extends Util.Singleton {
   }
 
   protected reportData() {
-    const clustersList = Store.catalogEntities.getItemsForApiKind<Store.KubernetesCluster>("entity.k8slens.dev/v1alpha1", "KubernetesCluster");
+    const clustersList = Catalog.catalogEntities.getItemsForApiKind<Catalog.KubernetesCluster>("entity.k8slens.dev/v1alpha1", "KubernetesCluster");
 
     this.event("generic-data", "report", {
       appVersion: App.version,
@@ -117,7 +117,7 @@ export class Tracker extends Util.Singleton {
     });
   }
 
-  protected reportClusterData(cluster: Store.KubernetesCluster) {
+  protected reportClusterData(cluster: Catalog.KubernetesCluster) {
     this.event("cluster-data", "report", {
       id: cluster.metadata.id,
       managed: cluster.metadata.source !== "local",
diff --git a/src/extensions/cluster-feature.ts b/src/extensions/cluster-feature.ts
index ad3a258b0e..24e3de5df1 100644
--- a/src/extensions/cluster-feature.ts
+++ b/src/extensions/cluster-feature.ts
@@ -3,7 +3,7 @@ import path from "path";
 import hb from "handlebars";
 import { observable } from "mobx";
 import { ResourceApplier } from "../main/resource-applier";
-import { KubernetesCluster } from "./core-api/stores";
+import { KubernetesCluster } from "./core-api/catalog";
 import logger from "../main/logger";
 import { app } from "electron";
 import { requestMain } from "../common/ipc";
diff --git a/src/extensions/core-api/catalog.ts b/src/extensions/core-api/catalog.ts
index a1dfcb41d0..f81846cd4d 100644
--- a/src/extensions/core-api/catalog.ts
+++ b/src/extensions/core-api/catalog.ts
@@ -3,6 +3,9 @@ import { computed } from "mobx";
 import { CatalogEntity } from "../../common/catalog-entity";
 import { catalogEntityRegistry as registry } from "../../common/catalog-entity-registry";
 
+export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog-category-registry";
+export * from "../../common/catalog-entities";
+
 export class CatalogEntityRegistry {
   @computed getItemsForApiKind<T extends CatalogEntity>(apiVersion: string, kind: string): T[] {
     return registry.getItemsForApiKind<T>(apiVersion, kind);
diff --git a/src/extensions/core-api/index.ts b/src/extensions/core-api/index.ts
index 19ede51817..9b075f049f 100644
--- a/src/extensions/core-api/index.ts
+++ b/src/extensions/core-api/index.ts
@@ -9,10 +9,12 @@ import * as Store from "./stores";
 import * as Util from "./utils";
 import * as ClusterFeature from "./cluster-feature";
 import * as Interface from "../interfaces";
+import * as Catalog from "./catalog";
 
 export {
   App,
   EventBus,
+  Catalog,
   ClusterFeature,
   Interface,
   Store,
diff --git a/src/extensions/core-api/stores.ts b/src/extensions/core-api/stores.ts
index cd01d6ae93..b79c11248a 100644
--- a/src/extensions/core-api/stores.ts
+++ b/src/extensions/core-api/stores.ts
@@ -1,4 +1 @@
 export { ExtensionStore } from "../extension-store";
-export { KubernetesCluster, KubernetesClusterCategory } from "../../common/catalog-entities/kubernetes-cluster";
-export { catalogCategoryRegistry as catalogCategories } from "../../common/catalog-category-registry";
-export { catalogEntities } from "./catalog";