diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index c7a8899b..b84c2b2d 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -13,7 +13,7 @@ import ThumbsUpSvg from "../svg-icons/thumbs_up_svg";
 import ThumbsDownSvg from "../svg-icons/thumbs_down_svg";
 import PencilSvg from "../svg-icons/pencil_svg";
 import { downvoteButtonColor, SkipNoticeAction } from "../utils/noticeUtils";
-import { GenericUtils } from "../utils/genericUtils";
+import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
 
 enum SkipButtonState {
     Undo, // Unskip
@@ -542,7 +542,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
         const sponsorVideoID = this.props.contentContainer().sponsorVideoID;
         const sponsorTimesSubmitting : SponsorTime = {
             segment: this.segments[index].segment,
-            UUID: GenericUtils.generateUserID() as SegmentUUID,
+            UUID: generateUserID() as SegmentUUID,
             category: this.segments[index].category,
             actionType: this.segments[index].actionType,
             source: SponsorSourceType.Local
diff --git a/src/content.ts b/src/content.ts
index 5798d3ff..12719fe5 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -42,6 +42,7 @@ import { setupVideoMutationListener, getChannelIDInfo, getVideo, refreshVideoAtt
 import { StorageChangesObject } from "@ajayyy/maze-utils/lib/config";
 import { findValidElement } from "@ajayyy/maze-utils/lib/dom"
 import { getHash, HashedValue } from "@ajayyy/maze-utils/lib/hash";
+import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
 
 const utils = new Utils();
 
@@ -1786,7 +1787,7 @@ function startOrEndTimingNewSegment() {
     if (!isSegmentCreationInProgress()) {
         sponsorTimesSubmitting.push({
             segment: [roundedTime],
-            UUID: GenericUtils.generateUserID() as SegmentUUID,
+            UUID: generateUserID() as SegmentUUID,
             category: Config.config.defaultCategory,
             actionType: ActionType.Skip,
             source: SponsorSourceType.Local
@@ -2393,7 +2394,7 @@ function checkForPreloadedSegment() {
                 if (!sponsorTimesSubmitting.some((s) => s.segment[0] === segment.segment[0] && s.segment[1] === s.segment[1])) {
                     sponsorTimesSubmitting.push({
                         segment: segment.segment,
-                        UUID: GenericUtils.generateUserID() as SegmentUUID,
+                        UUID: generateUserID() as SegmentUUID,
                         category: segment.category ? segment.category : Config.config.defaultCategory,
                         actionType: segment.actionType ? segment.actionType : ActionType.Skip,
                         description: segment.description ?? "",
diff --git a/src/utils/exporter.ts b/src/utils/exporter.ts
index 3a199708..25b7c254 100644
--- a/src/utils/exporter.ts
+++ b/src/utils/exporter.ts
@@ -1,8 +1,8 @@
 import { ActionType, Category, SegmentUUID, SponsorSourceType, SponsorTime } from "../types";
 import { shortCategoryName } from "./categoryUtils";
-import { GenericUtils } from "./genericUtils";
 import * as CompileConfig from "../../config.json";
 import { getFormattedTime, getFormattedTimeToSeconds } from "@ajayyy/maze-utils/lib/formating";
+import { generateUserID } from "@ajayyy/maze-utils/lib/setup";
 
 const inTest = typeof chrome === "undefined";
 
@@ -62,7 +62,7 @@ export function importTimes(data: string, videoDuration: number): SponsorTime[]
                         actionType: determinedCategory ? ActionType.Skip : ActionType.Chapter,
                         description: title,
                         source: SponsorSourceType.Local,
-                        UUID: GenericUtils.generateUserID() as SegmentUUID
+                        UUID: generateUserID() as SegmentUUID
                     };
 
                     if (result.length > 0 && result[result.length - 1].segment[1] === null) {