diff --git a/apps/server/src/routes/api/revisions.ts b/apps/server/src/routes/api/revisions.ts
index 6505a32c7..1eb691645 100644
--- a/apps/server/src/routes/api/revisions.ts
+++ b/apps/server/src/routes/api/revisions.ts
@@ -1,12 +1,11 @@
 
 
-import { EditedNotesResponse, RevisionItem, RevisionPojo, RevisionRow } from "@triliumnext/commons";
-import { becca_service } from "@triliumnext/core";
+import { EditedNotesResponse, RevisionItem, RevisionPojo } from "@triliumnext/commons";
+import { becca_service, NotePojo } from "@triliumnext/core";
 import type { Request, Response } from "express";
 import path from "path";
 
 import becca from "../../becca/becca.js";
-import type { NotePojo } from "../../becca/becca-interface.js";
 import type BNote from "../../becca/entities/bnote.js";
 import type BRevision from "../../becca/entities/brevision.js";
 import blobService from "../../services/blob.js";
diff --git a/apps/server/src/services/backend_script_api.ts b/apps/server/src/services/backend_script_api.ts
index d8e0a63c0..b7df6ccea 100644
--- a/apps/server/src/services/backend_script_api.ts
+++ b/apps/server/src/services/backend_script_api.ts
@@ -1,13 +1,10 @@
-import type { AttributeRow } from "@triliumnext/commons";
-import { dayjs } from "@triliumnext/commons";
-import { formatLogMessage } from "@triliumnext/commons";
-import type { AbstractBeccaEntity } from "@triliumnext/core";
+import { type AttributeRow, dayjs, formatLogMessage } from "@triliumnext/commons";
+import { type AbstractBeccaEntity, Becca } from "@triliumnext/core";
 import axios from "axios";
 import * as cheerio from "cheerio";
 import xml2js from "xml2js";
 
 import becca from "../becca/becca.js";
-import type Becca from "../becca/becca-interface.js";
 import type BAttachment from "../becca/entities/battachment.js";
 import type BAttribute from "../becca/entities/battribute.js";
 import type BBranch from "../becca/entities/bbranch.js";
diff --git a/packages/trilium-core/src/index.ts b/packages/trilium-core/src/index.ts
index 1aacf6bee..dcc228c4a 100644
--- a/packages/trilium-core/src/index.ts
+++ b/packages/trilium-core/src/index.ts
@@ -28,6 +28,8 @@ export { default as BOption } from "./becca/entities/boption";
 export { default as BRecentNote } from "./becca/entities/brecent_note";
 export { default as BRevision } from "./becca/entities/brevision";
 export { default as AbstractBeccaEntity } from "./becca/entities/abstract_becca_entity";
+export { default as Becca } from "./becca/becca-interface";
+export type { NotePojo } from "./becca/becca-interface";
 
 export function initializeCore({ dbConfig, executionContext, crypto }: {
     dbConfig: SqlServiceParams,