diff --git a/types/ProgramStatics.d.ts b/types/ProgramStatics.d.ts
new file mode 100644
index 00000000..4c14c6af
--- /dev/null
+++ b/types/ProgramStatics.d.ts
@@ -0,0 +1,20 @@
+import { EntryType } from "./models/enums/EntryType";
+export declare class ProgramStatics {
+    private static _ENTRY_TYPE;
+    private static _DEBUG;
+    private static _COMPILED;
+    private static _MODS;
+    private static _EXPECTED_NODE;
+    private static _SPT_VERSION;
+    private static _COMMIT;
+    private static _BUILD_TIME;
+    static initialize(): void;
+    static get ENTRY_TYPE(): EntryType;
+    static get DEBUG(): boolean;
+    static get COMPILED(): boolean;
+    static get MODS(): boolean;
+    static get EXPECTED_NODE(): string;
+    static get SPT_VERSION(): string;
+    static get COMMIT(): string;
+    static get BUILD_TIME(): number;
+}
diff --git a/types/callbacks/AchievementCallbacks.d.ts b/types/callbacks/AchievementCallbacks.d.ts
index 9f817ac1..4fb7125c 100644
--- a/types/callbacks/AchievementCallbacks.d.ts
+++ b/types/callbacks/AchievementCallbacks.d.ts
@@ -1,9 +1,9 @@
 import { AchievementController } from "@spt/controllers/AchievementController";
 import { ProfileController } from "@spt/controllers/ProfileController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse";
-import type { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse";
+import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class AchievementCallbacks {
     protected achievementController: AchievementController;
diff --git a/types/callbacks/BotCallbacks.d.ts b/types/callbacks/BotCallbacks.d.ts
index f30ae438..909e93ee 100644
--- a/types/callbacks/BotCallbacks.d.ts
+++ b/types/callbacks/BotCallbacks.d.ts
@@ -1,10 +1,10 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { BotController } from "@spt/controllers/BotController";
-import type { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IDifficulties } from "@spt/models/eft/common/tables/IBotType";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IDifficulties } from "@spt/models/eft/common/tables/IBotType";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class BotCallbacks {
     protected botController: BotController;
diff --git a/types/callbacks/BuildsCallbacks.d.ts b/types/callbacks/BuildsCallbacks.d.ts
index 37f708f2..79fee873 100644
--- a/types/callbacks/BuildsCallbacks.d.ts
+++ b/types/callbacks/BuildsCallbacks.d.ts
@@ -1,11 +1,11 @@
 import { BuildController } from "@spt/controllers/BuildController";
-import type { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
-import type { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData";
-import type { IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
+import { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
+import { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData";
+import { IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class BuildsCallbacks {
     protected httpResponse: HttpResponseUtil;
diff --git a/types/callbacks/BundleCallbacks.d.ts b/types/callbacks/BundleCallbacks.d.ts
index da9f514b..3e579dcb 100644
--- a/types/callbacks/BundleCallbacks.d.ts
+++ b/types/callbacks/BundleCallbacks.d.ts
@@ -1,5 +1,5 @@
 import { BundleLoader } from "@spt/loaders/BundleLoader";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class BundleCallbacks {
diff --git a/types/callbacks/ClientLogCallbacks.d.ts b/types/callbacks/ClientLogCallbacks.d.ts
index 1dc302df..bfeb9a41 100644
--- a/types/callbacks/ClientLogCallbacks.d.ts
+++ b/types/callbacks/ClientLogCallbacks.d.ts
@@ -1,7 +1,7 @@
 import { ClientLogController } from "@spt/controllers/ClientLogController";
 import { ModLoadOrder } from "@spt/loaders/ModLoadOrder";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
diff --git a/types/callbacks/CustomizationCallbacks.d.ts b/types/callbacks/CustomizationCallbacks.d.ts
index 8a2e7a00..658282d7 100644
--- a/types/callbacks/CustomizationCallbacks.d.ts
+++ b/types/callbacks/CustomizationCallbacks.d.ts
@@ -1,16 +1,16 @@
 import { CustomizationController } from "@spt/controllers/CustomizationController";
 import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
 import type { IPmcData } from "@spt/models/eft/common/IPmcData";
+import type { ICustomisationStorage } from "@spt/models/eft/common/tables/ICustomisationStorage";
 import type { ISuit } from "@spt/models/eft/common/tables/ITrader";
 import type { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData";
+import type { ICustomizationSetRequest } from "@spt/models/eft/customization/ICustomizationSetRequest";
 import type { IGetSuitsResponse } from "@spt/models/eft/customization/IGetSuitsResponse";
-import type { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData";
-import type { ICustomizationSetRequest } from "@spt/models/eft/customization/iCustomizationSetRequest";
+import type { IHideoutCustomisation } from "@spt/models/eft/hideout/IHideoutCustomisation";
 import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
-import type { ICustomisationStorage } from "../models/eft/common/tables/ICustomisationStorage";
 export declare class CustomizationCallbacks {
     protected customizationController: CustomizationController;
     protected saveServer: SaveServer;
@@ -26,16 +26,14 @@ export declare class CustomizationCallbacks {
      * @returns ISuit[]
      */
     getTraderSuits(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ISuit[]>;
-    /**
-     * Handle CustomizationWear event
-     */
-    wearClothing(pmcData: IPmcData, body: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handle CustomizationBuy event
      */
     buyClothing(pmcData: IPmcData, body: IBuyClothingRequestData, sessionID: string): IItemEventRouterResponse;
-    getHideoutCustomisation(url: string, info: any, sessionID: string): IGetBodyResponseData<any>;
-    getStorage(url: string, info: any, sessionID: string): IGetBodyResponseData<ICustomisationStorage>;
+    /** Handle client/hideout/customization/offer/list */
+    getHideoutCustomisation(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IHideoutCustomisation>;
+    /** Handle client/customization/storage */
+    getStorage(url: string, request: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ICustomisationStorage[]>;
     /** Handle CustomizationSet */
-    setClothing(pmcData: IPmcData, info: ICustomizationSetRequest, sessionID: string): IGetBodyResponseData<any>;
+    setClothing(pmcData: IPmcData, request: ICustomizationSetRequest, sessionID: string): IItemEventRouterResponse;
 }
diff --git a/types/callbacks/DataCallbacks.d.ts b/types/callbacks/DataCallbacks.d.ts
index a561cff5..5b501e1e 100644
--- a/types/callbacks/DataCallbacks.d.ts
+++ b/types/callbacks/DataCallbacks.d.ts
@@ -1,16 +1,16 @@
 import { HideoutController } from "@spt/controllers/HideoutController";
 import { TraderController } from "@spt/controllers/TraderController";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGlobals } from "@spt/models/eft/common/IGlobals";
-import type { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem";
-import type { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
-import type { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
-import type { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
-import type { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
-import type { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGlobals } from "@spt/models/eft/common/IGlobals";
+import { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem";
+import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
+import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
+import { IHideoutArea } from "@spt/models/eft/hideout/IHideoutArea";
+import { IHideoutProductionData } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IHideoutSettingsBase } from "@spt/models/eft/hideout/IHideoutSettingsBase";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
diff --git a/types/callbacks/DialogueCallbacks.d.ts b/types/callbacks/DialogueCallbacks.d.ts
index 35cf5a42..e65749ff 100644
--- a/types/callbacks/DialogueCallbacks.d.ts
+++ b/types/callbacks/DialogueCallbacks.d.ts
@@ -1,33 +1,33 @@
 import { DialogueController } from "@spt/controllers/DialogueController";
-import type { OnUpdate } from "@spt/di/OnUpdate";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
-import type { IAcceptFriendRequestData, ICancelFriendRequestData, IDeclineFriendRequestData } from "@spt/models/eft/dialog/IAcceptFriendRequestData";
-import type { IAddUserGroupMailRequest } from "@spt/models/eft/dialog/IAddUserGroupMailRequest";
-import type { IChangeGroupMailOwnerRequest } from "@spt/models/eft/dialog/IChangeGroupMailOwnerRequest";
-import type { IChatServer } from "@spt/models/eft/dialog/IChatServer";
-import type { IClearMailMessageRequest } from "@spt/models/eft/dialog/IClearMailMessageRequest";
-import type { ICreateGroupMailRequest } from "@spt/models/eft/dialog/ICreateGroupMailRequest";
-import type { IDeleteFriendRequest } from "@spt/models/eft/dialog/IDeleteFriendRequest";
-import type { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
-import type { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse";
-import type { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData";
-import type { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
-import type { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData";
-import type { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
-import type { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData";
-import type { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData";
-import type { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
-import type { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
-import type { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData";
-import type { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData";
-import type { IRemoveMailMessageRequest } from "@spt/models/eft/dialog/IRemoveMailMessageRequest";
-import type { IRemoveUserGroupMailRequest } from "@spt/models/eft/dialog/IRemoveUserGroupMailRequest";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IDialogueInfo } from "@spt/models/eft/profile/ISptProfile";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { IAcceptFriendRequestData, ICancelFriendRequestData, IDeclineFriendRequestData } from "@spt/models/eft/dialog/IAcceptFriendRequestData";
+import { IAddUserGroupMailRequest } from "@spt/models/eft/dialog/IAddUserGroupMailRequest";
+import { IChangeGroupMailOwnerRequest } from "@spt/models/eft/dialog/IChangeGroupMailOwnerRequest";
+import { IChatServer } from "@spt/models/eft/dialog/IChatServer";
+import { IClearMailMessageRequest } from "@spt/models/eft/dialog/IClearMailMessageRequest";
+import { ICreateGroupMailRequest } from "@spt/models/eft/dialog/ICreateGroupMailRequest";
+import { IDeleteFriendRequest } from "@spt/models/eft/dialog/IDeleteFriendRequest";
+import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
+import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse";
+import { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData";
+import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData";
+import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
+import { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData";
+import { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData";
+import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
+import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
+import { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData";
+import { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData";
+import { IRemoveMailMessageRequest } from "@spt/models/eft/dialog/IRemoveMailMessageRequest";
+import { IRemoveUserGroupMailRequest } from "@spt/models/eft/dialog/IRemoveUserGroupMailRequest";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IDialogueInfo } from "@spt/models/eft/profile/ISptProfile";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
diff --git a/types/callbacks/GameCallbacks.d.ts b/types/callbacks/GameCallbacks.d.ts
index 65b85c5f..fc866ce7 100644
--- a/types/callbacks/GameCallbacks.d.ts
+++ b/types/callbacks/GameCallbacks.d.ts
@@ -1,24 +1,24 @@
 import { GameController } from "@spt/controllers/GameController";
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
-import type { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse";
-import type { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse";
-import type { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
-import type { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData";
-import type { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse";
-import type { IGameLogoutResponseData } from "@spt/models/eft/game/IGameLogoutResponseData";
-import type { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData";
-import type { IGameModeResponse } from "@spt/models/eft/game/IGameModeResponse";
-import type { IGameStartResponse } from "@spt/models/eft/game/IGameStartResponse";
-import type { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
-import type { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
-import type { ISendSurveyOpinionRequest } from "@spt/models/eft/game/ISendSurveyOpinionRequest";
-import type { IServerDetails } from "@spt/models/eft/game/IServerDetails";
-import type { ISurveyResponseData } from "@spt/models/eft/game/ISurveyResponseData";
-import type { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { OnLoad } from "@spt/di/OnLoad";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse";
+import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse";
+import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
+import { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData";
+import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse";
+import { IGameLogoutResponseData } from "@spt/models/eft/game/IGameLogoutResponseData";
+import { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData";
+import { IGameModeResponse } from "@spt/models/eft/game/IGameModeResponse";
+import { IGameStartResponse } from "@spt/models/eft/game/IGameStartResponse";
+import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
+import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
+import { ISendSurveyOpinionRequest } from "@spt/models/eft/game/ISendSurveyOpinionRequest";
+import { IServerDetails } from "@spt/models/eft/game/IServerDetails";
+import { ISurveyResponseData } from "@spt/models/eft/game/ISurveyResponseData";
+import { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { Watermark } from "@spt/utils/Watermark";
diff --git a/types/callbacks/HandbookCallbacks.d.ts b/types/callbacks/HandbookCallbacks.d.ts
index ef22e639..61819de4 100644
--- a/types/callbacks/HandbookCallbacks.d.ts
+++ b/types/callbacks/HandbookCallbacks.d.ts
@@ -1,5 +1,5 @@
 import { HandbookController } from "@spt/controllers/HandbookController";
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 export declare class HandbookCallbacks implements OnLoad {
     protected handbookController: HandbookController;
     constructor(handbookController: HandbookController);
diff --git a/types/callbacks/HealthCallbacks.d.ts b/types/callbacks/HealthCallbacks.d.ts
index cf8077a0..8523479d 100644
--- a/types/callbacks/HealthCallbacks.d.ts
+++ b/types/callbacks/HealthCallbacks.d.ts
@@ -1,12 +1,12 @@
 import { HealthController } from "@spt/controllers/HealthController";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
-import type { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
-import type { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
-import type { IWorkoutData } from "@spt/models/eft/health/IWorkoutData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
+import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
+import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
+import { IWorkoutData } from "@spt/models/eft/health/IWorkoutData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class HealthCallbacks {
     protected httpResponse: HttpResponseUtil;
diff --git a/types/callbacks/HideoutCallbacks.d.ts b/types/callbacks/HideoutCallbacks.d.ts
index c6601f8b..9843972b 100644
--- a/types/callbacks/HideoutCallbacks.d.ts
+++ b/types/callbacks/HideoutCallbacks.d.ts
@@ -18,7 +18,7 @@ import type { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout
 import type { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData";
 import type { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints";
 import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class HideoutCallbacks implements OnUpdate {
     protected hideoutController: HideoutController;
diff --git a/types/callbacks/HttpCallbacks.d.ts b/types/callbacks/HttpCallbacks.d.ts
index 0fa90607..11b2db5e 100644
--- a/types/callbacks/HttpCallbacks.d.ts
+++ b/types/callbacks/HttpCallbacks.d.ts
@@ -1,4 +1,4 @@
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 import { HttpServer } from "@spt/servers/HttpServer";
 export declare class HttpCallbacks implements OnLoad {
     protected httpServer: HttpServer;
diff --git a/types/callbacks/InraidCallbacks.d.ts b/types/callbacks/InraidCallbacks.d.ts
index 9bea1d55..02b46f39 100644
--- a/types/callbacks/InraidCallbacks.d.ts
+++ b/types/callbacks/InraidCallbacks.d.ts
@@ -1,8 +1,8 @@
-import type { InraidController } from "@spt/controllers/InraidController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData";
-import type { IScavSaveRequestData } from "@spt/models/eft/inRaid/IScavSaveRequestData";
+import { InraidController } from "@spt/controllers/InraidController";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData";
+import { IScavSaveRequestData } from "@spt/models/eft/inRaid/IScavSaveRequestData";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 /**
  * Handle client requests
diff --git a/types/callbacks/InsuranceCallbacks.d.ts b/types/callbacks/InsuranceCallbacks.d.ts
index 5d1a6127..888f1283 100644
--- a/types/callbacks/InsuranceCallbacks.d.ts
+++ b/types/callbacks/InsuranceCallbacks.d.ts
@@ -1,14 +1,14 @@
-import type { InsuranceController } from "@spt/controllers/InsuranceController";
-import type { OnUpdate } from "@spt/di/OnUpdate";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
-import type { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData";
-import type { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
+import { InsuranceController } from "@spt/controllers/InsuranceController";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData";
+import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
-import type { InsuranceService } from "@spt/services/InsuranceService";
+import { InsuranceService } from "@spt/services/InsuranceService";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class InsuranceCallbacks implements OnUpdate {
     protected insuranceController: InsuranceController;
diff --git a/types/callbacks/InventoryCallbacks.d.ts b/types/callbacks/InventoryCallbacks.d.ts
index 3fe447c6..cfbf6f37 100644
--- a/types/callbacks/InventoryCallbacks.d.ts
+++ b/types/callbacks/InventoryCallbacks.d.ts
@@ -1,28 +1,28 @@
-import type { InventoryController } from "@spt/controllers/InventoryController";
+import { InventoryController } from "@spt/controllers/InventoryController";
 import { QuestController } from "@spt/controllers/QuestController";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
-import type { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
-import type { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import type { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
-import type { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
-import type { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
-import type { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
-import type { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
-import type { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import type { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
-import type { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
-import type { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
-import type { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
-import type { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
-import type { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
-import type { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
-import type { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData";
-import type { IPinOrLockItemRequest } from "@spt/models/eft/inventory/IPinOrLockItemRequest";
-import type { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData";
-import type { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
+import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
+import { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData";
+import { IPinOrLockItemRequest } from "@spt/models/eft/inventory/IPinOrLockItemRequest";
+import { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData";
+import { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
 export declare class InventoryCallbacks {
     protected inventoryController: InventoryController;
     protected questController: QuestController;
diff --git a/types/callbacks/ItemEventCallbacks.d.ts b/types/callbacks/ItemEventCallbacks.d.ts
index b1532530..2d42ae3f 100644
--- a/types/callbacks/ItemEventCallbacks.d.ts
+++ b/types/callbacks/ItemEventCallbacks.d.ts
@@ -1,8 +1,8 @@
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { Warning } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
-import type { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ItemEventRouter } from "@spt/routers/ItemEventRouter";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { Warning } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
+import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ItemEventRouter } from "@spt/routers/ItemEventRouter";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class ItemEventCallbacks {
     protected httpResponse: HttpResponseUtil;
diff --git a/types/callbacks/LauncherCallbacks.d.ts b/types/callbacks/LauncherCallbacks.d.ts
index 8beb19f3..46fb3f46 100644
--- a/types/callbacks/LauncherCallbacks.d.ts
+++ b/types/callbacks/LauncherCallbacks.d.ts
@@ -1,9 +1,9 @@
 import { LauncherController } from "@spt/controllers/LauncherController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
-import type { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
-import type { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
-import type { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
+import { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { Watermark } from "@spt/utils/Watermark";
diff --git a/types/callbacks/LocationCallbacks.d.ts b/types/callbacks/LocationCallbacks.d.ts
index 8335e157..f3ffea37 100644
--- a/types/callbacks/LocationCallbacks.d.ts
+++ b/types/callbacks/LocationCallbacks.d.ts
@@ -1,9 +1,9 @@
 import { LocationController } from "@spt/controllers/LocationController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IGetAirdropLootRequest } from "@spt/models/eft/location/IGetAirdropLootRequest";
-import type { IGetAirdropLootResponse } from "@spt/models/eft/location/IGetAirdropLootResponse";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGetAirdropLootRequest } from "@spt/models/eft/location/IGetAirdropLootRequest";
+import { IGetAirdropLootResponse } from "@spt/models/eft/location/IGetAirdropLootResponse";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class LocationCallbacks {
     protected httpResponse: HttpResponseUtil;
diff --git a/types/callbacks/MatchCallbacks.d.ts b/types/callbacks/MatchCallbacks.d.ts
index 10c843f0..f8342606 100644
--- a/types/callbacks/MatchCallbacks.d.ts
+++ b/types/callbacks/MatchCallbacks.d.ts
@@ -1,24 +1,24 @@
 import { MatchController } from "@spt/controllers/MatchController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IMetrics } from "@spt/models/eft/common/tables/IMatch";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IEndLocalRaidRequestData } from "@spt/models/eft/match/IEndLocalRaidRequestData";
-import type { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
-import type { IMatchGroupCurrentResponse } from "@spt/models/eft/match/IMatchGroupCurrentResponse";
-import type { IMatchGroupInviteSendRequest } from "@spt/models/eft/match/IMatchGroupInviteSendRequest";
-import type { IMatchGroupPlayerRemoveRequest } from "@spt/models/eft/match/IMatchGroupPlayerRemoveRequest";
-import type { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest";
-import type { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest";
-import type { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse";
-import type { IMatchGroupTransferRequest } from "@spt/models/eft/match/IMatchGroupTransferRequest";
-import type { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse";
-import type { IPutMetricsRequestData } from "@spt/models/eft/match/IPutMetricsRequestData";
-import type { IRequestIdRequest } from "@spt/models/eft/match/IRequestIdRequest";
-import type { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
-import type { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
-import type { IUpdatePingRequestData } from "@spt/models/eft/match/IUpdatePingRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IMetrics } from "@spt/models/eft/common/tables/IMatch";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IEndLocalRaidRequestData } from "@spt/models/eft/match/IEndLocalRaidRequestData";
+import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IMatchGroupCurrentResponse } from "@spt/models/eft/match/IMatchGroupCurrentResponse";
+import { IMatchGroupInviteSendRequest } from "@spt/models/eft/match/IMatchGroupInviteSendRequest";
+import { IMatchGroupPlayerRemoveRequest } from "@spt/models/eft/match/IMatchGroupPlayerRemoveRequest";
+import { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest";
+import { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest";
+import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse";
+import { IMatchGroupTransferRequest } from "@spt/models/eft/match/IMatchGroupTransferRequest";
+import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse";
+import { IPutMetricsRequestData } from "@spt/models/eft/match/IPutMetricsRequestData";
+import { IRequestIdRequest } from "@spt/models/eft/match/IRequestIdRequest";
+import { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
+import { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
+import { IUpdatePingRequestData } from "@spt/models/eft/match/IUpdatePingRequestData";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { JsonUtil } from "@spt/utils/JsonUtil";
diff --git a/types/callbacks/ModCallbacks.d.ts b/types/callbacks/ModCallbacks.d.ts
index 04c3f03c..4bfe884a 100644
--- a/types/callbacks/ModCallbacks.d.ts
+++ b/types/callbacks/ModCallbacks.d.ts
@@ -1,6 +1,6 @@
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 import { PostSptModLoader } from "@spt/loaders/PostSptModLoader";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/callbacks/NoteCallbacks.d.ts b/types/callbacks/NoteCallbacks.d.ts
index 4b020542..d0781714 100644
--- a/types/callbacks/NoteCallbacks.d.ts
+++ b/types/callbacks/NoteCallbacks.d.ts
@@ -1,7 +1,7 @@
 import { NoteController } from "@spt/controllers/NoteController";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
 export declare class NoteCallbacks {
     protected noteController: NoteController;
     constructor(noteController: NoteController);
diff --git a/types/callbacks/NotifierCallbacks.d.ts b/types/callbacks/NotifierCallbacks.d.ts
index 6f52e35a..0436e121 100644
--- a/types/callbacks/NotifierCallbacks.d.ts
+++ b/types/callbacks/NotifierCallbacks.d.ts
@@ -1,10 +1,10 @@
 import { NotifierController } from "@spt/controllers/NotifierController";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
-import type { ISelectProfileResponse } from "@spt/models/eft/notifier/ISelectProfileResponse";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
+import { ISelectProfileResponse } from "@spt/models/eft/notifier/ISelectProfileResponse";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 export declare class NotifierCallbacks {
diff --git a/types/callbacks/PresetCallbacks.d.ts b/types/callbacks/PresetCallbacks.d.ts
index c7828582..24edfa2f 100644
--- a/types/callbacks/PresetCallbacks.d.ts
+++ b/types/callbacks/PresetCallbacks.d.ts
@@ -1,5 +1,5 @@
 import { PresetController } from "@spt/controllers/PresetController";
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 export declare class PresetCallbacks implements OnLoad {
     protected presetController: PresetController;
     constructor(presetController: PresetController);
diff --git a/types/callbacks/PrestigeCallbacks.d.ts b/types/callbacks/PrestigeCallbacks.d.ts
index c0e0bb46..4b87065f 100644
--- a/types/callbacks/PrestigeCallbacks.d.ts
+++ b/types/callbacks/PrestigeCallbacks.d.ts
@@ -1,18 +1,16 @@
 import type { PrestigeController } from "@spt/controllers/PrestigeController";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
 import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPrestige } from "@spt/models/eft/common/tables/IPrestige";
 import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
-import { JsonUtil } from "@spt/utils/JsonUtil";
 export declare class PrestigeCallbacks {
     protected httpServerHelper: HttpServerHelper;
     protected httpResponse: HttpResponseUtil;
-    protected jsonUtil: JsonUtil;
     protected prestigeController: PrestigeController;
-    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, jsonUtil: JsonUtil, prestigeController: PrestigeController);
+    constructor(httpServerHelper: HttpServerHelper, httpResponse: HttpResponseUtil, prestigeController: PrestigeController);
     /** Handle client/prestige/list */
-    getPrestige(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<INotifierChannel>;
+    getPrestige(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IPrestige>;
     /** Handle client/prestige/obtain */
-    obtainPrestige(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<INotifierChannel>;
+    obtainPrestige(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
 }
diff --git a/types/callbacks/ProfileCallbacks.d.ts b/types/callbacks/ProfileCallbacks.d.ts
index af243be9..3824a8cc 100644
--- a/types/callbacks/ProfileCallbacks.d.ts
+++ b/types/callbacks/ProfileCallbacks.d.ts
@@ -1,21 +1,21 @@
 import { ProfileController } from "@spt/controllers/ProfileController";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData";
-import type { IGetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData";
-import type { ICreateProfileResponse } from "@spt/models/eft/profile/ICreateProfileResponse";
-import type { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest";
-import type { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse";
-import type { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest";
-import type { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
-import type { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
-import type { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
-import type { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
-import type { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
-import type { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData";
+import { IGetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData";
+import { ICreateProfileResponse } from "@spt/models/eft/profile/ICreateProfileResponse";
+import { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest";
+import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse";
+import { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest";
+import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
+import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
+import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
 /** Handle profile related client events */
diff --git a/types/callbacks/QuestCallbacks.d.ts b/types/callbacks/QuestCallbacks.d.ts
index e0fbf6e4..dec034e4 100644
--- a/types/callbacks/QuestCallbacks.d.ts
+++ b/types/callbacks/QuestCallbacks.d.ts
@@ -1,16 +1,16 @@
 import { QuestController } from "@spt/controllers/QuestController";
 import { RepeatableQuestController } from "@spt/controllers/RepeatableQuestController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IQuest } from "@spt/models/eft/common/tables/IQuest";
-import type { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
-import type { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
-import type { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
-import type { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData";
-import type { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IQuest } from "@spt/models/eft/common/tables/IQuest";
+import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
+import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
+import { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData";
+import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class QuestCallbacks {
     protected httpResponse: HttpResponseUtil;
diff --git a/types/callbacks/RagfairCallbacks.d.ts b/types/callbacks/RagfairCallbacks.d.ts
index 7aa10980..1e929963 100644
--- a/types/callbacks/RagfairCallbacks.d.ts
+++ b/types/callbacks/RagfairCallbacks.d.ts
@@ -1,23 +1,23 @@
 import { RagfairController } from "@spt/controllers/RagfairController";
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { OnUpdate } from "@spt/di/OnUpdate";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData";
-import type { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
-import type { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
-import type { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
-import type { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult";
-import type { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
-import type { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
-import type { ISendRagfairReportRequestData } from "@spt/models/eft/ragfair/ISendRagfairReportRequestData";
-import type { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
+import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult";
+import { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { ISendRagfairReportRequestData } from "@spt/models/eft/ragfair/ISendRagfairReportRequestData";
+import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { RagfairServer } from "@spt/servers/RagfairServer";
 import { RagfairTaxService } from "@spt/services/RagfairTaxService";
diff --git a/types/callbacks/RepairCallbacks.d.ts b/types/callbacks/RepairCallbacks.d.ts
index fa942f61..930708e4 100644
--- a/types/callbacks/RepairCallbacks.d.ts
+++ b/types/callbacks/RepairCallbacks.d.ts
@@ -1,8 +1,8 @@
 import { RepairController } from "@spt/controllers/RepairController";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
-import type { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
 export declare class RepairCallbacks {
     protected repairController: RepairController;
     constructor(repairController: RepairController);
diff --git a/types/callbacks/SaveCallbacks.d.ts b/types/callbacks/SaveCallbacks.d.ts
index 50c85801..3d5f2126 100644
--- a/types/callbacks/SaveCallbacks.d.ts
+++ b/types/callbacks/SaveCallbacks.d.ts
@@ -1,6 +1,6 @@
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { OnUpdate } from "@spt/di/OnUpdate";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { BackupService } from "@spt/services/BackupService";
diff --git a/types/callbacks/TradeCallbacks.d.ts b/types/callbacks/TradeCallbacks.d.ts
index 4de05ff5..0f8ebe3d 100644
--- a/types/callbacks/TradeCallbacks.d.ts
+++ b/types/callbacks/TradeCallbacks.d.ts
@@ -1,9 +1,9 @@
 import { TradeController } from "@spt/controllers/TradeController";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
-import type { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
-import type { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
+import { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData";
 export declare class TradeCallbacks {
     protected tradeController: TradeController;
     constructor(tradeController: TradeController);
diff --git a/types/callbacks/TraderCallbacks.d.ts b/types/callbacks/TraderCallbacks.d.ts
index 4873bab7..7bebe559 100644
--- a/types/callbacks/TraderCallbacks.d.ts
+++ b/types/callbacks/TraderCallbacks.d.ts
@@ -1,10 +1,10 @@
 import { TraderController } from "@spt/controllers/TraderController";
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { OnUpdate } from "@spt/di/OnUpdate";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IModdedTraders } from "@spt/models/spt/config/ITraderConfig";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IModdedTraders } from "@spt/models/spt/config/ITraderConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class TraderCallbacks implements OnLoad, OnUpdate {
diff --git a/types/callbacks/WeatherCallbacks.d.ts b/types/callbacks/WeatherCallbacks.d.ts
index e207b526..ef5808fa 100644
--- a/types/callbacks/WeatherCallbacks.d.ts
+++ b/types/callbacks/WeatherCallbacks.d.ts
@@ -1,8 +1,8 @@
 import { WeatherController } from "@spt/controllers/WeatherController";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IWeatherData } from "@spt/models/eft/weather/IWeatherData";
-import type { IGetLocalWeatherResponseData } from "@spt/models/spt/weather/IGetLocalWeatherResponseData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IWeatherData } from "@spt/models/eft/weather/IWeatherData";
+import { IGetLocalWeatherResponseData } from "@spt/models/spt/weather/IGetLocalWeatherResponseData";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 export declare class WeatherCallbacks {
     protected httpResponse: HttpResponseUtil;
diff --git a/types/callbacks/WishlistCallbacks.d.ts b/types/callbacks/WishlistCallbacks.d.ts
index e721fa21..414eb91e 100644
--- a/types/callbacks/WishlistCallbacks.d.ts
+++ b/types/callbacks/WishlistCallbacks.d.ts
@@ -1,9 +1,9 @@
 import { WishlistController } from "@spt/controllers/WishlistController";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAddToWishlistRequest } from "@spt/models/eft/wishlist/IAddToWishlistRequest";
-import type { IChangeWishlistItemCategoryRequest } from "@spt/models/eft/wishlist/IChangeWishlistItemCategoryRequest";
-import type { IRemoveFromWishlistRequest } from "@spt/models/eft/wishlist/IRemoveFromWishlistRequest";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAddToWishlistRequest } from "@spt/models/eft/wishlist/IAddToWishlistRequest";
+import { IChangeWishlistItemCategoryRequest } from "@spt/models/eft/wishlist/IChangeWishlistItemCategoryRequest";
+import { IRemoveFromWishlistRequest } from "@spt/models/eft/wishlist/IRemoveFromWishlistRequest";
 export declare class WishlistCallbacks {
     protected wishlistController: WishlistController;
     constructor(wishlistController: WishlistController);
diff --git a/types/controllers/AchievementController.d.ts b/types/controllers/AchievementController.d.ts
index f8979d47..80f7d3db 100644
--- a/types/controllers/AchievementController.d.ts
+++ b/types/controllers/AchievementController.d.ts
@@ -1,5 +1,5 @@
-import type { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse";
-import type { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse";
+import { ICompletedAchievementsResponse } from "@spt/models/eft/profile/ICompletedAchievementsResponse";
+import { IGetAchievementsResponse } from "@spt/models/eft/profile/IGetAchievementsResponse";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 /**
diff --git a/types/controllers/BotController.d.ts b/types/controllers/BotController.d.ts
index 6a31552f..2453bad0 100644
--- a/types/controllers/BotController.d.ts
+++ b/types/controllers/BotController.d.ts
@@ -4,16 +4,16 @@ import { BotDifficultyHelper } from "@spt/helpers/BotDifficultyHelper";
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { MinMax } from "@spt/models/common/MinMax";
-import type { ICondition, IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
-import type { IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
-import type { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
-import type { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { MinMax } from "@spt/models/common/MinMax";
+import { ICondition, IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
+import { IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
+import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
+import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService";
diff --git a/types/controllers/BuildController.d.ts b/types/controllers/BuildController.d.ts
index b5d6f099..4860af95 100644
--- a/types/controllers/BuildController.d.ts
+++ b/types/controllers/BuildController.d.ts
@@ -1,9 +1,9 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest";
-import type { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
-import type { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData";
-import type { IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
+import { ISetMagazineRequest } from "@spt/models/eft/builds/ISetMagazineRequest";
+import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
+import { IRemoveBuildRequestData } from "@spt/models/eft/presetBuild/IRemoveBuildRequestData";
+import { IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/controllers/ClientLogController.d.ts b/types/controllers/ClientLogController.d.ts
index fb7f7c85..480e3b67 100644
--- a/types/controllers/ClientLogController.d.ts
+++ b/types/controllers/ClientLogController.d.ts
@@ -1,4 +1,4 @@
-import type { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
+import { IClientLogRequest } from "@spt/models/spt/logging/IClientLogRequest";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 export declare class ClientLogController {
     protected logger: ILogger;
diff --git a/types/controllers/CustomizationController.d.ts b/types/controllers/CustomizationController.d.ts
index 33af8da5..4bd7e4e3 100644
--- a/types/controllers/CustomizationController.d.ts
+++ b/types/controllers/CustomizationController.d.ts
@@ -1,17 +1,19 @@
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
 import type { IPmcData } from "@spt/models/eft/common/IPmcData";
 import type { ICustomisationStorage } from "@spt/models/eft/common/tables/ICustomisationStorage";
 import type { ISuit } from "@spt/models/eft/common/tables/ITrader";
 import type { IBuyClothingRequestData, IPaymentItemForClothing } from "@spt/models/eft/customization/IBuyClothingRequestData";
-import type { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData";
-import type { ICustomizationSetRequest } from "@spt/models/eft/customization/iCustomizationSetRequest";
+import type { CustomizationSetOption, ICustomizationSetRequest } from "@spt/models/eft/customization/ICustomizationSetRequest";
 import type { IHideoutCustomisation } from "@spt/models/eft/hideout/IHideoutCustomisation";
 import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
+import type { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class CustomizationController {
     protected logger: ILogger;
     protected eventOutputHolder: EventOutputHolder;
@@ -19,11 +21,12 @@ export declare class CustomizationController {
     protected saveServer: SaveServer;
     protected localisationService: LocalisationService;
     protected profileHelper: ProfileHelper;
+    protected cloner: ICloner;
     protected readonly clothingIds: {
         lowerParentId: string;
         upperParentId: string;
     };
-    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, saveServer: SaveServer, localisationService: LocalisationService, profileHelper: ProfileHelper);
+    constructor(logger: ILogger, eventOutputHolder: EventOutputHolder, databaseService: DatabaseService, saveServer: SaveServer, localisationService: LocalisationService, profileHelper: ProfileHelper, cloner: ICloner);
     /**
      * Get purchasable clothing items from trader that match players side (usec/bear)
      * @param traderID trader to look up clothing for
@@ -31,11 +34,6 @@ export declare class CustomizationController {
      * @returns ISuit array
      */
     getTraderSuits(traderID: string, sessionID: string): ISuit[];
-    /**
-     * Handle CustomizationWear event
-     * Equip one to many clothing items to player
-     */
-    wearClothing(pmcData: IPmcData, wearClothingRequest: IWearClothingRequestData, sessionID: string): IItemEventRouterResponse;
     /**
      * Handle CustomizationBuy event
      * Purchase/unlock a clothing item from a trader
@@ -70,8 +68,17 @@ export declare class CustomizationController {
      */
     protected payForClothingItem(sessionId: string, pmcData: IPmcData, paymentItemDetails: IPaymentItemForClothing, output: IItemEventRouterResponse): void;
     protected getAllTraderSuits(sessionID: string): ISuit[];
-    getHideoutCustomisation(sessionID: string, info: any): IHideoutCustomisation;
-    getCustomisationStoage(sessionID: string, info: any): ICustomisationStorage[];
+    /** Handle client/hideout/customization/offer/list */
+    getHideoutCustomisation(sessionID: string, info: IEmptyRequestData): IHideoutCustomisation;
+    /** Handle client/customization/storage */
+    getCustomisationStorage(sessionID: string, info: IEmptyRequestData): ICustomisationStorage[];
+    protected getGameEdition(profile: ISptProfile): string;
     /** Handle CustomizationSet event */
-    setClothing(sessionId: string, info: ICustomizationSetRequest, pmcData: IPmcData): any;
+    setClothing(sessionId: string, request: ICustomizationSetRequest, pmcData: IPmcData): IItemEventRouterResponse;
+    /**
+     * Applies a purchsed suit to the players doll
+     * @param customisation Suit to apply to profile
+     * @param pmcData Profile to update
+     */
+    protected applyClothingItemToProfile(customisation: CustomizationSetOption, pmcData: IPmcData): void;
 }
diff --git a/types/controllers/DialogueController.d.ts b/types/controllers/DialogueController.d.ts
index 07641b45..63b57398 100644
--- a/types/controllers/DialogueController.d.ts
+++ b/types/controllers/DialogueController.d.ts
@@ -1,16 +1,17 @@
-import type { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
+import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
 import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IDeleteFriendRequest } from "@spt/models/eft/dialog/IDeleteFriendRequest";
-import type { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
-import type { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse";
-import type { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
-import type { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
-import type { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
-import type { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IDialogue, IDialogueInfo, IMessage, ISptProfile, IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IDeleteFriendRequest } from "@spt/models/eft/dialog/IDeleteFriendRequest";
+import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
+import { IFriendRequestSendResponse } from "@spt/models/eft/dialog/IFriendRequestSendResponse";
+import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
+import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
+import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IDialogue, IDialogueInfo, IMessage, ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import { MessageType } from "@spt/models/enums/MessageType";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/controllers/GameController.d.ts b/types/controllers/GameController.d.ts
index c39f169a..a2e83b15 100644
--- a/types/controllers/GameController.d.ts
+++ b/types/controllers/GameController.d.ts
@@ -1,32 +1,32 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { HideoutHelper } from "@spt/helpers/HideoutHelper";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse";
-import type { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse";
-import type { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
-import type { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse";
-import type { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData";
-import type { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
-import type { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
-import type { IServerDetails } from "@spt/models/eft/game/IServerDetails";
-import type { ISurveyResponseData } from "@spt/models/eft/game/ISurveyResponseData";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { ICheckVersionResponse } from "@spt/models/eft/game/ICheckVersionResponse";
+import { ICurrentGroupResponse } from "@spt/models/eft/game/ICurrentGroupResponse";
+import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
+import { IGameKeepAliveResponse } from "@spt/models/eft/game/IGameKeepAliveResponse";
+import { IGameModeRequestData } from "@spt/models/eft/game/IGameModeRequestData";
+import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
+import { IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
+import { IServerDetails } from "@spt/models/eft/game/IServerDetails";
+import { ISurveyResponseData } from "@spt/models/eft/game/ISurveyResponseData";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { CustomLocationWaveService } from "@spt/services/CustomLocationWaveService";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { GiftService } from "@spt/services/GiftService";
-import type { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
+import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { OpenZoneService } from "@spt/services/OpenZoneService";
 import { PostDbLoadService } from "@spt/services/PostDbLoadService";
diff --git a/types/controllers/HealthController.d.ts b/types/controllers/HealthController.d.ts
index 28f462ab..0766ac60 100644
--- a/types/controllers/HealthController.d.ts
+++ b/types/controllers/HealthController.d.ts
@@ -1,12 +1,12 @@
 import { HealthHelper } from "@spt/helpers/HealthHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
-import type { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
-import type { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
-import type { IWorkoutData } from "@spt/models/eft/health/IWorkoutData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
+import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
+import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
+import { IWorkoutData } from "@spt/models/eft/health/IWorkoutData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/controllers/HideoutController.d.ts b/types/controllers/HideoutController.d.ts
index 3f4ff0ca..93fafdca 100644
--- a/types/controllers/HideoutController.d.ts
+++ b/types/controllers/HideoutController.d.ts
@@ -1,7 +1,7 @@
 import { ScavCaseRewardGenerator } from "@spt/generators/ScavCaseRewardGenerator";
 import { HideoutHelper } from "@spt/helpers/HideoutHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
@@ -28,7 +28,7 @@ import type { IQteData, IQteResult } from "@spt/models/eft/hideout/IQteData";
 import type { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints";
 import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/controllers/InraidController.d.ts b/types/controllers/InraidController.d.ts
index a183fe41..082c25cc 100644
--- a/types/controllers/InraidController.d.ts
+++ b/types/controllers/InraidController.d.ts
@@ -1,9 +1,9 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData";
-import type { IScavSaveRequestData } from "@spt/models/eft/inRaid/IScavSaveRequestData";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
+import { IRegisterPlayerRequestData } from "@spt/models/eft/inRaid/IRegisterPlayerRequestData";
+import { IScavSaveRequestData } from "@spt/models/eft/inRaid/IScavSaveRequestData";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/controllers/InsuranceController.d.ts b/types/controllers/InsuranceController.d.ts
index 2e5dc8ee..1ac5dcfb 100644
--- a/types/controllers/InsuranceController.d.ts
+++ b/types/controllers/InsuranceController.d.ts
@@ -1,22 +1,22 @@
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
-import type { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData";
-import type { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IInsurance } from "@spt/models/eft/profile/ISptProfile";
-import type { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
+import { IGetInsuranceCostResponseData } from "@spt/models/eft/insurance/IGetInsuranceCostResponseData";
+import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IInsurance } from "@spt/models/eft/profile/ISptProfile";
+import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { InsuranceService } from "@spt/services/InsuranceService";
+import { InsuranceService } from "@spt/services/InsuranceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { PaymentService } from "@spt/services/PaymentService";
diff --git a/types/controllers/InventoryController.d.ts b/types/controllers/InventoryController.d.ts
index 82a0527d..e9a3e061 100644
--- a/types/controllers/InventoryController.d.ts
+++ b/types/controllers/InventoryController.d.ts
@@ -1,35 +1,35 @@
 import { LootGenerator } from "@spt/generators/LootGenerator";
 import { HideoutHelper } from "@spt/helpers/HideoutHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
-import type { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
-import type { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import type { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
-import type { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
-import type { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
-import type { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
-import type { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
-import type { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import type { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
-import type { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
-import type { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
-import type { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
-import type { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
-import type { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
-import type { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
-import type { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData";
-import type { IPinOrLockItemRequest } from "@spt/models/eft/inventory/IPinOrLockItemRequest";
-import type { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData";
-import type { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
+import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
+import { IOpenRandomLootContainerRequestData } from "@spt/models/eft/inventory/IOpenRandomLootContainerRequestData";
+import { IPinOrLockItemRequest } from "@spt/models/eft/inventory/IPinOrLockItemRequest";
+import { IRedeemProfileRequestData } from "@spt/models/eft/inventory/IRedeemProfileRequestData";
+import { ISetFavoriteItems } from "@spt/models/eft/inventory/ISetFavoriteItems";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/controllers/LauncherController.d.ts b/types/controllers/LauncherController.d.ts
index 6c5e3add..9b6999af 100644
--- a/types/controllers/LauncherController.d.ts
+++ b/types/controllers/LauncherController.d.ts
@@ -1,13 +1,13 @@
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
-import type { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
-import type { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
-import type { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
-import type { IConnectResponse } from "@spt/models/eft/profile/IConnectResponse";
-import type { IModDetails, Info } from "@spt/models/eft/profile/ISptProfile";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
-import type { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
+import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
+import { IConnectResponse } from "@spt/models/eft/profile/IConnectResponse";
+import { IModDetails, Info } from "@spt/models/eft/profile/ISptProfile";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/controllers/LocationController.d.ts b/types/controllers/LocationController.d.ts
index 4031b9c1..eb0840b2 100644
--- a/types/controllers/LocationController.d.ts
+++ b/types/controllers/LocationController.d.ts
@@ -1,7 +1,7 @@
-import type { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
-import type { IGetAirdropLootRequest } from "@spt/models/eft/location/IGetAirdropLootRequest";
-import type { IGetAirdropLootResponse } from "@spt/models/eft/location/IGetAirdropLootResponse";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
+import { IGetAirdropLootRequest } from "@spt/models/eft/location/IGetAirdropLootRequest";
+import { IGetAirdropLootResponse } from "@spt/models/eft/location/IGetAirdropLootResponse";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { AirdropService } from "@spt/services/AirdropService";
diff --git a/types/controllers/MatchController.d.ts b/types/controllers/MatchController.d.ts
index 8f5d049a..47b46305 100644
--- a/types/controllers/MatchController.d.ts
+++ b/types/controllers/MatchController.d.ts
@@ -1,14 +1,14 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
-import type { IEndLocalRaidRequestData } from "@spt/models/eft/match/IEndLocalRaidRequestData";
-import type { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
-import type { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest";
-import type { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest";
-import type { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse";
-import type { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse";
-import type { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
-import type { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
-import type { IMatchConfig } from "@spt/models/spt/config/IMatchConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IEndLocalRaidRequestData } from "@spt/models/eft/match/IEndLocalRaidRequestData";
+import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
+import { IMatchGroupStartGameRequest } from "@spt/models/eft/match/IMatchGroupStartGameRequest";
+import { IMatchGroupStatusRequest } from "@spt/models/eft/match/IMatchGroupStatusRequest";
+import { IMatchGroupStatusResponse } from "@spt/models/eft/match/IMatchGroupStatusResponse";
+import { IProfileStatusResponse } from "@spt/models/eft/match/IProfileStatusResponse";
+import { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
+import { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
+import { IMatchConfig } from "@spt/models/spt/config/IMatchConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/controllers/NoteController.d.ts b/types/controllers/NoteController.d.ts
index 642b20c1..a46a0aa3 100644
--- a/types/controllers/NoteController.d.ts
+++ b/types/controllers/NoteController.d.ts
@@ -1,6 +1,6 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 export declare class NoteController {
     protected eventOutputHolder: EventOutputHolder;
diff --git a/types/controllers/NotifierController.d.ts b/types/controllers/NotifierController.d.ts
index e2da4fb1..8939bee9 100644
--- a/types/controllers/NotifierController.d.ts
+++ b/types/controllers/NotifierController.d.ts
@@ -1,6 +1,6 @@
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
 import { NotifierHelper } from "@spt/helpers/NotifierHelper";
-import type { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
+import { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
 import { NotificationService } from "@spt/services/NotificationService";
 export declare class NotifierController {
     protected notifierHelper: NotifierHelper;
diff --git a/types/controllers/PrestigeController.d.ts b/types/controllers/PrestigeController.d.ts
index 8a7d90a8..d6f195ff 100644
--- a/types/controllers/PrestigeController.d.ts
+++ b/types/controllers/PrestigeController.d.ts
@@ -4,6 +4,7 @@ import type { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
+import { IPrestige } from "@spt/models/eft/common/tables/IPrestige";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { SaveServer } from "@spt/servers/SaveServer";
@@ -38,7 +39,7 @@ export declare class PrestigeController {
     /**
      * Handle /client/prestige/list
      */
-    getPrestige(sessionID: string, info: any): any;
+    getPrestige(sessionID: string, info: IEmptyRequestData): IPrestige;
     /**
      * Handle /client/prestige/obtain
      */
diff --git a/types/controllers/ProfileController.d.ts b/types/controllers/ProfileController.d.ts
index 8f8c88c5..7e11868b 100644
--- a/types/controllers/ProfileController.d.ts
+++ b/types/controllers/ProfileController.d.ts
@@ -1,23 +1,23 @@
 import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator";
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IMiniProfile } from "@spt/models/eft/launcher/IMiniProfile";
-import type { IGetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData";
-import type { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest";
-import type { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse";
-import type { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest";
-import type { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
-import type { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
-import type { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
-import type { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
-import type { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IMiniProfile } from "@spt/models/eft/launcher/IMiniProfile";
+import { IGetProfileStatusResponseData } from "@spt/models/eft/profile/GetProfileStatusResponseData";
+import { IGetOtherProfileRequest } from "@spt/models/eft/profile/IGetOtherProfileRequest";
+import { IGetOtherProfileResponse } from "@spt/models/eft/profile/IGetOtherProfileResponse";
+import { IGetProfileSettingsRequest } from "@spt/models/eft/profile/IGetProfileSettingsRequest";
+import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
+import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { SaveServer } from "@spt/servers/SaveServer";
@@ -72,6 +72,12 @@ export declare class ProfileController {
      * @param pmcData Profile to update
      */
     protected updateInventoryEquipmentId(pmcData: IPmcData): void;
+    /**
+     * Ensure a profile has the necessary internal containers e.g. questRaidItems / sortingTable
+     * DOES NOT check that stash exists
+     * @param pmcData Profile to check
+     */
+    protected addMissingInternalContainersToProfile(pmcData: IPmcData): void;
     /**
      * Delete a profile
      * @param sessionID Id of profile to delete
diff --git a/types/controllers/QuestController.d.ts b/types/controllers/QuestController.d.ts
index 6dfd5b01..e4c3e692 100644
--- a/types/controllers/QuestController.d.ts
+++ b/types/controllers/QuestController.d.ts
@@ -1,19 +1,19 @@
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestConditionHelper } from "@spt/helpers/QuestConditionHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IQuest, IQuestCondition } from "@spt/models/eft/common/tables/IQuest";
-import type { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
-import type { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
-import type { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
-import type { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
-import type { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IQuest, IQuestCondition } from "@spt/models/eft/common/tables/IQuest";
+import { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
+import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
+import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
+import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/controllers/RagfairController.d.ts b/types/controllers/RagfairController.d.ts
index c5081cb9..b0f7f865 100644
--- a/types/controllers/RagfairController.d.ts
+++ b/types/controllers/RagfairController.d.ts
@@ -1,7 +1,7 @@
 import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator";
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { RagfairHelper } from "@spt/helpers/RagfairHelper";
@@ -9,23 +9,23 @@ import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper";
 import { RagfairSellHelper } from "@spt/helpers/RagfairSellHelper";
 import { RagfairSortHelper } from "@spt/helpers/RagfairSortHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IAddOfferRequestData, IRequirement } from "@spt/models/eft/ragfair/IAddOfferRequestData";
-import type { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
-import type { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
-import type { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
-import type { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult";
-import type { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
-import type { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
-import type { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IAddOfferRequestData, IRequirement } from "@spt/models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
+import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
+import { IGetOffersResult } from "@spt/models/eft/ragfair/IGetOffersResult";
+import { IGetRagfairOfferByIdRequest } from "@spt/models/eft/ragfair/IGetRagfairOfferByIdRequest";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
 import { FleaOfferType } from "@spt/models/enums/FleaOfferType";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/controllers/RepairController.d.ts b/types/controllers/RepairController.d.ts
index d4acbce0..cd39edcf 100644
--- a/types/controllers/RepairController.d.ts
+++ b/types/controllers/RepairController.d.ts
@@ -2,11 +2,11 @@ import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { RepairHelper } from "@spt/helpers/RepairHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
-import type { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
-import type { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
+import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/controllers/RepeatableQuestController.d.ts b/types/controllers/RepeatableQuestController.d.ts
index 830a501b..17f8bc94 100644
--- a/types/controllers/RepeatableQuestController.d.ts
+++ b/types/controllers/RepeatableQuestController.d.ts
@@ -2,15 +2,15 @@ import { RepeatableQuestGenerator } from "@spt/generators/RepeatableQuestGenerat
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
 import { ELocationName } from "@spt/models/enums/ELocationName";
-import type { IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
-import type { IGetRepeatableByIdResult } from "@spt/models/spt/quests/IGetRepeatableByIdResult";
-import type { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool";
+import { IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IGetRepeatableByIdResult } from "@spt/models/spt/quests/IGetRepeatableByIdResult";
+import { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/controllers/TradeController.d.ts b/types/controllers/TradeController.d.ts
index 6b51a2d4..bb7d1a80 100644
--- a/types/controllers/TradeController.d.ts
+++ b/types/controllers/TradeController.d.ts
@@ -1,19 +1,19 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper";
 import { TradeHelper } from "@spt/helpers/TradeHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITraderBase } from "@spt/models/eft/common/tables/ITrader";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
-import type { IOfferRequest, IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
-import type { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IOfferRequest, IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
+import { ISellScavItemsToFenceRequestData } from "@spt/models/eft/trade/ISellScavItemsToFenceRequestData";
 import { Traders } from "@spt/models/enums/Traders";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/controllers/TraderController.d.ts b/types/controllers/TraderController.d.ts
index ee296d15..8d09fa5c 100644
--- a/types/controllers/TraderController.d.ts
+++ b/types/controllers/TraderController.d.ts
@@ -1,10 +1,11 @@
 import { FenceBaseAssortGenerator } from "@spt/generators/FenceBaseAssortGenerator";
+import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
-import type { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IGetItemPricesResponse } from "@spt/models/eft/game/IGetItemPricesResponse";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
@@ -21,6 +22,7 @@ export declare class TraderController {
     protected traderAssortHelper: TraderAssortHelper;
     protected profileHelper: ProfileHelper;
     protected traderHelper: TraderHelper;
+    protected paymentHelper: PaymentHelper;
     protected traderAssortService: TraderAssortService;
     protected ragfairPriceService: RagfairPriceService;
     protected traderPurchasePersisterService: TraderPurchasePersisterService;
@@ -29,7 +31,7 @@ export declare class TraderController {
     protected configServer: ConfigServer;
     protected cloner: ICloner;
     protected traderConfig: ITraderConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, traderAssortService: TraderAssortService, ragfairPriceService: RagfairPriceService, traderPurchasePersisterService: TraderPurchasePersisterService, fenceService: FenceService, fenceBaseAssortGenerator: FenceBaseAssortGenerator, configServer: ConfigServer, cloner: ICloner);
+    constructor(logger: ILogger, timeUtil: TimeUtil, databaseService: DatabaseService, traderAssortHelper: TraderAssortHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, paymentHelper: PaymentHelper, traderAssortService: TraderAssortService, ragfairPriceService: RagfairPriceService, traderPurchasePersisterService: TraderPurchasePersisterService, fenceService: FenceService, fenceBaseAssortGenerator: FenceBaseAssortGenerator, configServer: ConfigServer, cloner: ICloner);
     /**
      * Runs when onLoad event is fired
      * Iterate over traders, ensure a pristine copy of their assorts is stored in traderAssortService
diff --git a/types/controllers/WeatherController.d.ts b/types/controllers/WeatherController.d.ts
index ded8330d..dcae6081 100644
--- a/types/controllers/WeatherController.d.ts
+++ b/types/controllers/WeatherController.d.ts
@@ -1,9 +1,9 @@
 import { WeatherGenerator } from "@spt/generators/WeatherGenerator";
 import { WeatherHelper } from "@spt/helpers/WeatherHelper";
-import type { IWeatherData } from "@spt/models/eft/weather/IWeatherData";
-import type { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { IWeatherData } from "@spt/models/eft/weather/IWeatherData";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
-import type { IGetLocalWeatherResponseData } from "@spt/models/spt/weather/IGetLocalWeatherResponseData";
+import { IGetLocalWeatherResponseData } from "@spt/models/spt/weather/IGetLocalWeatherResponseData";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { RaidWeatherService } from "@spt/services/RaidWeatherService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
diff --git a/types/controllers/WishlistController.d.ts b/types/controllers/WishlistController.d.ts
index 92636a49..7559dc66 100644
--- a/types/controllers/WishlistController.d.ts
+++ b/types/controllers/WishlistController.d.ts
@@ -1,8 +1,8 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAddToWishlistRequest } from "@spt/models/eft/wishlist/IAddToWishlistRequest";
-import type { IChangeWishlistItemCategoryRequest } from "@spt/models/eft/wishlist/IChangeWishlistItemCategoryRequest";
-import type { IRemoveFromWishlistRequest } from "@spt/models/eft/wishlist/IRemoveFromWishlistRequest";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAddToWishlistRequest } from "@spt/models/eft/wishlist/IAddToWishlistRequest";
+import { IChangeWishlistItemCategoryRequest } from "@spt/models/eft/wishlist/IChangeWishlistItemCategoryRequest";
+import { IRemoveFromWishlistRequest } from "@spt/models/eft/wishlist/IRemoveFromWishlistRequest";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 export declare class WishlistController {
     protected eventOutputHolder: EventOutputHolder;
diff --git a/types/di/Container.d.ts b/types/di/Container.d.ts
index b998171e..06199683 100644
--- a/types/di/Container.d.ts
+++ b/types/di/Container.d.ts
@@ -1,4 +1,4 @@
-import type { DependencyContainer } from "tsyringe";
+import { DependencyContainer } from "tsyringe";
 /**
  * Handle the registration of classes to be used by the Dependency Injection code
  */
diff --git a/types/di/Router.d.ts b/types/di/Router.d.ts
index 8778198a..01ca5477 100644
--- a/types/di/Router.d.ts
+++ b/types/di/Router.d.ts
@@ -1,6 +1,6 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export declare class Router {
     protected handledRoutes: HandledRoute[];
     getTopLevelRoute(): string;
diff --git a/types/di/Serializer.d.ts b/types/di/Serializer.d.ts
index da5747c4..a48dd584 100644
--- a/types/di/Serializer.d.ts
+++ b/types/di/Serializer.d.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 export declare class Serializer {
     serialize(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any): Promise<void>;
     canHandle(something: string): boolean;
diff --git a/types/entry/run.d.ts b/types/entry/run.d.ts
new file mode 100644
index 00000000..62f714ea
--- /dev/null
+++ b/types/entry/run.d.ts
@@ -0,0 +1,2 @@
+import "reflect-metadata";
+import "source-map-support/register";
diff --git a/types/generators/BotEquipmentModGenerator.d.ts b/types/generators/BotEquipmentModGenerator.d.ts
index 54764390..b9abdf69 100644
--- a/types/generators/BotEquipmentModGenerator.d.ts
+++ b/types/generators/BotEquipmentModGenerator.d.ts
@@ -1,22 +1,22 @@
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProbabilityHelper } from "@spt/helpers/ProbabilityHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IPreset } from "@spt/models/eft/common/IGlobals";
-import type { IMods, IModsChances } from "@spt/models/eft/common/tables/IBotType";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ISlot, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { IMods, IModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ISlot, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { ModSpawn } from "@spt/models/enums/ModSpawn";
-import type { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult";
-import type { IFilterPlateModsForSlotByLevelResult } from "@spt/models/spt/bots/IFilterPlateModsForSlotByLevelResult";
-import type { IGenerateEquipmentProperties } from "@spt/models/spt/bots/IGenerateEquipmentProperties";
-import type { IGenerateWeaponRequest } from "@spt/models/spt/bots/IGenerateWeaponRequest";
-import type { IModToSpawnRequest } from "@spt/models/spt/bots/IModToSpawnRequest";
-import type { EquipmentFilters, IBotConfig, IEquipmentFilterDetails } from "@spt/models/spt/config/IBotConfig";
+import { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult";
+import { IFilterPlateModsForSlotByLevelResult } from "@spt/models/spt/bots/IFilterPlateModsForSlotByLevelResult";
+import { IGenerateEquipmentProperties } from "@spt/models/spt/bots/IGenerateEquipmentProperties";
+import { IGenerateWeaponRequest } from "@spt/models/spt/bots/IGenerateWeaponRequest";
+import { IModToSpawnRequest } from "@spt/models/spt/bots/IModToSpawnRequest";
+import { EquipmentFilters, IBotConfig, IEquipmentFilterDetails } from "@spt/models/spt/config/IBotConfig";
 import { ExhaustableArray } from "@spt/models/spt/server/ExhaustableArray";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
@@ -24,7 +24,7 @@ import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterServi
 import { BotEquipmentModPoolService } from "@spt/services/BotEquipmentModPoolService";
 import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
diff --git a/types/generators/BotGenerator.d.ts b/types/generators/BotGenerator.d.ts
index d8223386..35047848 100644
--- a/types/generators/BotGenerator.d.ts
+++ b/types/generators/BotGenerator.d.ts
@@ -4,13 +4,13 @@ import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { MinMax } from "@spt/models/common/MinMax";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
-import type { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
-import type { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { MinMax } from "@spt/models/common/MinMax";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBaseJsonSkills, IBaseSkill, IBotBase, IInfo, IHealth as PmcHealth, ISkills as botSkills } from "@spt/models/eft/common/tables/IBotBase";
+import { IAppearance, IBodyPart, IBotType, IHealth, IInventory } from "@spt/models/eft/common/tables/IBotType";
+import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService";
diff --git a/types/generators/BotInventoryGenerator.d.ts b/types/generators/BotInventoryGenerator.d.ts
index 9a192d44..ada8369e 100644
--- a/types/generators/BotInventoryGenerator.d.ts
+++ b/types/generators/BotInventoryGenerator.d.ts
@@ -4,16 +4,16 @@ import { BotLootGenerator } from "@spt/generators/BotLootGenerator";
 import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator";
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotHelper } from "@spt/helpers/BotHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { WeatherHelper } from "@spt/helpers/WeatherHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotType, IChances, IEquipment, IGeneration, IInventory } from "@spt/models/eft/common/tables/IBotType";
-import type { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
+import { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotType, IChances, IEquipment, IGeneration, IInventory } from "@spt/models/eft/common/tables/IBotType";
+import { IGetRaidConfigurationRequestData } from "@spt/models/eft/match/IGetRaidConfigurationRequestData";
 import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
-import type { IGenerateEquipmentProperties } from "@spt/models/spt/bots/IGenerateEquipmentProperties";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IGenerateEquipmentProperties } from "@spt/models/spt/bots/IGenerateEquipmentProperties";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { BotEquipmentFilterService } from "@spt/services/BotEquipmentFilterService";
diff --git a/types/generators/BotLevelGenerator.d.ts b/types/generators/BotLevelGenerator.d.ts
index e914102c..cd8d1bdc 100644
--- a/types/generators/BotLevelGenerator.d.ts
+++ b/types/generators/BotLevelGenerator.d.ts
@@ -1,7 +1,7 @@
-import type { MinMax } from "@spt/models/common/MinMax";
-import type { IRandomisedBotLevelResult } from "@spt/models/eft/bot/IRandomisedBotLevelResult";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { MinMax } from "@spt/models/common/MinMax";
+import { IRandomisedBotLevelResult } from "@spt/models/eft/bot/IRandomisedBotLevelResult";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { MathUtil } from "@spt/utils/MathUtil";
diff --git a/types/generators/BotLootGenerator.d.ts b/types/generators/BotLootGenerator.d.ts
index 9cbc696b..3a37d7a2 100644
--- a/types/generators/BotLootGenerator.d.ts
+++ b/types/generators/BotLootGenerator.d.ts
@@ -2,17 +2,17 @@ import { BotWeaponGenerator } from "@spt/generators/BotWeaponGenerator";
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotType, IInventory, IModsChances } from "@spt/models/eft/common/tables/IBotType";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotType, IInventory, IModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
-import type { IItemSpawnLimitSettings } from "@spt/models/spt/bots/IItemSpawnLimitSettings";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IItemSpawnLimitSettings } from "@spt/models/spt/bots/IItemSpawnLimitSettings";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { BotLootCacheService } from "@spt/services/BotLootCacheService";
diff --git a/types/generators/BotWeaponGenerator.d.ts b/types/generators/BotWeaponGenerator.d.ts
index 33d7b7f1..adc32540 100644
--- a/types/generators/BotWeaponGenerator.d.ts
+++ b/types/generators/BotWeaponGenerator.d.ts
@@ -1,17 +1,17 @@
 import { BotEquipmentModGenerator } from "@spt/generators/BotEquipmentModGenerator";
-import type { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
+import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IGenerationData, IInventory, IModsChances } from "@spt/models/eft/common/tables/IBotType";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IGenerateWeaponResult } from "@spt/models/spt/bots/IGenerateWeaponResult";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
-import type { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
+import { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IGenerationData, IInventory, IModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IGenerateWeaponResult } from "@spt/models/spt/bots/IGenerateWeaponResult";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService";
diff --git a/types/generators/FenceBaseAssortGenerator.d.ts b/types/generators/FenceBaseAssortGenerator.d.ts
index 8d8180bb..7cad9b0b 100644
--- a/types/generators/FenceBaseAssortGenerator.d.ts
+++ b/types/generators/FenceBaseAssortGenerator.d.ts
@@ -1,14 +1,14 @@
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { FenceService } from "@spt/services/FenceService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 import { HashUtil } from "@spt/utils/HashUtil";
diff --git a/types/generators/LocationLootGenerator.d.ts b/types/generators/LocationLootGenerator.d.ts
index 95cf7cfa..4d0a2014 100644
--- a/types/generators/LocationLootGenerator.d.ts
+++ b/types/generators/LocationLootGenerator.d.ts
@@ -1,15 +1,16 @@
 import { ContainerHelper } from "@spt/helpers/ContainerHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { IContainerMinMax, IStaticAmmoDetails, IStaticContainer, IStaticContainerData, IStaticForcedProps, IStaticLootDetails } from "@spt/models/eft/common/ILocation";
-import type { ILocationBase } from "@spt/models/eft/common/ILocationBase";
-import type { ILooseLoot, ISpawnpointTemplate, ISpawnpointsForced } from "@spt/models/eft/common/ILooseLoot";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IContainerMinMax, IStaticAmmoDetails, IStaticContainer, IStaticContainerData, IStaticForcedProps, IStaticLootDetails } from "@spt/models/eft/common/ILocation";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { ILooseLoot, ISpawnpointTemplate, ISpawnpointsForced } from "@spt/models/eft/common/ILooseLoot";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { ISeasonalEventConfig } from "@spt/models/spt/config/ISeasonalEventConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 import { MathUtil } from "@spt/utils/MathUtil";
@@ -42,6 +43,7 @@ export declare class LocationLootGenerator {
     protected configServer: ConfigServer;
     protected cloner: ICloner;
     protected locationConfig: ILocationConfig;
+    protected seasonalEventConfig: ISeasonalEventConfig;
     constructor(logger: ILogger, databaseService: DatabaseService, objectId: ObjectId, randomUtil: RandomUtil, itemHelper: ItemHelper, mathUtil: MathUtil, seasonalEventService: SeasonalEventService, containerHelper: ContainerHelper, presetHelper: PresetHelper, localisationService: LocalisationService, itemFilterService: ItemFilterService, configServer: ConfigServer, cloner: ICloner);
     /**
      * Create an array of container objects with randomised loot
diff --git a/types/generators/LootGenerator.d.ts b/types/generators/LootGenerator.d.ts
index 9f2b9b17..fd44d9ac 100644
--- a/types/generators/LootGenerator.d.ts
+++ b/types/generators/LootGenerator.d.ts
@@ -1,16 +1,16 @@
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { MinMax } from "@spt/models/common/MinMax";
-import type { IPreset } from "@spt/models/eft/common/IGlobals";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IRewardDetails, ISealedAirdropContainerSettings } from "@spt/models/spt/config/IInventoryConfig";
-import type { ILootRequest } from "@spt/models/spt/services/ILootRequest";
+import { MinMax } from "@spt/models/common/MinMax";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IRewardDetails, ISealedAirdropContainerSettings } from "@spt/models/spt/config/IInventoryConfig";
+import { ILootRequest } from "@spt/models/spt/services/ILootRequest";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { RagfairLinkedItemService } from "@spt/services/RagfairLinkedItemService";
 import { HashUtil } from "@spt/utils/HashUtil";
diff --git a/types/generators/PMCLootGenerator.d.ts b/types/generators/PMCLootGenerator.d.ts
index 8dab171f..f1974352 100644
--- a/types/generators/PMCLootGenerator.d.ts
+++ b/types/generators/PMCLootGenerator.d.ts
@@ -1,10 +1,10 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { RagfairPriceService } from "@spt/services/RagfairPriceService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 /**
diff --git a/types/generators/PlayerScavGenerator.d.ts b/types/generators/PlayerScavGenerator.d.ts
index 9b4fd7c7..c452c8a4 100644
--- a/types/generators/PlayerScavGenerator.d.ts
+++ b/types/generators/PlayerScavGenerator.d.ts
@@ -1,12 +1,12 @@
 import { BotGenerator } from "@spt/generators/BotGenerator";
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotHelper } from "@spt/helpers/BotHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBotBase, ISkills, IStats } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotType } from "@spt/models/eft/common/tables/IBotType";
-import type { IKarmaLevel, IPlayerScavConfig } from "@spt/models/spt/config/IPlayerScavConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBotBase, ISkills, IStats } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotType } from "@spt/models/eft/common/tables/IBotType";
+import { IKarmaLevel, IPlayerScavConfig } from "@spt/models/spt/config/IPlayerScavConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/generators/RagfairAssortGenerator.d.ts b/types/generators/RagfairAssortGenerator.d.ts
index ecc17a0d..60c4c86f 100644
--- a/types/generators/RagfairAssortGenerator.d.ts
+++ b/types/generators/RagfairAssortGenerator.d.ts
@@ -1,8 +1,8 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { IPreset } from "@spt/models/eft/common/IGlobals";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
diff --git a/types/generators/RagfairOfferGenerator.d.ts b/types/generators/RagfairOfferGenerator.d.ts
index ff4d713d..3fbd9be7 100644
--- a/types/generators/RagfairOfferGenerator.d.ts
+++ b/types/generators/RagfairOfferGenerator.d.ts
@@ -1,19 +1,19 @@
 import { RagfairAssortGenerator } from "@spt/generators/RagfairAssortGenerator";
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
-import type { IOfferRequirement, IRagfairOffer, IRagfairOfferUser } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IArmorPlateBlacklistSettings, IBarterDetails, IDynamic, IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
-import type { ITplWithFleaPrice } from "@spt/models/spt/ragfair/ITplWithFleaPrice";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
+import { IOfferRequirement, IRagfairOffer, IRagfairOfferUser } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IArmorPlateBlacklistSettings, IBarterDetails, IDynamic, IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ITplWithFleaPrice } from "@spt/models/spt/ragfair/ITplWithFleaPrice";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/generators/RepeatableQuestGenerator.d.ts b/types/generators/RepeatableQuestGenerator.d.ts
index 4f8fba48..cecee9eb 100644
--- a/types/generators/RepeatableQuestGenerator.d.ts
+++ b/types/generators/RepeatableQuestGenerator.d.ts
@@ -1,12 +1,12 @@
 import { RepeatableQuestRewardGenerator } from "@spt/generators/RepeatableQuestRewardGenerator";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { RepeatableQuestHelper } from "@spt/helpers/RepeatableQuestHelper";
-import type { IExit } from "@spt/models/eft/common/ILocationBase";
-import type { ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
-import type { IQuestCondition, IQuestConditionCounterCondition } from "@spt/models/eft/common/tables/IQuest";
-import type { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
-import type { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool";
+import { IExit } from "@spt/models/eft/common/ILocationBase";
+import { ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
+import { IQuestCondition, IQuestConditionCounterCondition } from "@spt/models/eft/common/tables/IQuest";
+import { IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IBossInfo, IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IQuestTypePool } from "@spt/models/spt/repeatable/IQuestTypePool";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/generators/RepeatableQuestRewardGenerator.d.ts b/types/generators/RepeatableQuestRewardGenerator.d.ts
index 5c34c1d6..e9b53288 100644
--- a/types/generators/RepeatableQuestRewardGenerator.d.ts
+++ b/types/generators/RepeatableQuestRewardGenerator.d.ts
@@ -1,15 +1,15 @@
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IQuestReward, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IBaseQuestConfig, IQuestConfig, IRepeatableQuestConfig, IRewardScaling } from "@spt/models/spt/config/IQuestConfig";
-import type { IQuestRewardValues } from "@spt/models/spt/repeatable/IQuestRewardValues";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IQuestReward, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBaseQuestConfig, IQuestConfig, IRepeatableQuestConfig, IRewardScaling } from "@spt/models/spt/config/IQuestConfig";
+import { IQuestRewardValues } from "@spt/models/spt/repeatable/IQuestRewardValues";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 import { HashUtil } from "@spt/utils/HashUtil";
diff --git a/types/generators/ScavCaseRewardGenerator.d.ts b/types/generators/ScavCaseRewardGenerator.d.ts
index d4e03e6c..9cb265e7 100644
--- a/types/generators/ScavCaseRewardGenerator.d.ts
+++ b/types/generators/ScavCaseRewardGenerator.d.ts
@@ -1,14 +1,14 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
-import type { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
-import type { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IScavRecipe } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IScavCaseConfig } from "@spt/models/spt/config/IScavCaseConfig";
+import { IRewardCountAndPriceDetails, IScavCaseRewardCountsAndPrices } from "@spt/models/spt/hideout/ScavCaseRewardCountsAndPrices";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { RagfairPriceService } from "@spt/services/RagfairPriceService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 import { HashUtil } from "@spt/utils/HashUtil";
diff --git a/types/generators/WeatherGenerator.d.ts b/types/generators/WeatherGenerator.d.ts
index e96ee4d6..77429279 100644
--- a/types/generators/WeatherGenerator.d.ts
+++ b/types/generators/WeatherGenerator.d.ts
@@ -1,10 +1,10 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { WeatherHelper } from "@spt/helpers/WeatherHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IWeather, IWeatherData } from "@spt/models/eft/weather/IWeatherData";
+import { IWeather, IWeatherData } from "@spt/models/eft/weather/IWeatherData";
 import { Season } from "@spt/models/enums/Season";
 import { WindDirection } from "@spt/models/enums/WindDirection";
-import type { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { ISeasonalValues, IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
@@ -48,23 +48,24 @@ export declare class WeatherGenerator {
      * @returns Randomised weather data
      */
     generateWeather(currentSeason: Season, timestamp?: number): IWeather;
+    protected getWeatherValuesBySeason(currentSeason: Season): ISeasonalValues;
     /**
-     * Choose a temprature for the raid based on time of day and current season
+     * Choose a temprature for the raid based on time of day
      * @param currentSeason What season tarkov is currently in
      * @param inRaidTimestamp What time is the raid running at
      * @returns Timestamp
      */
-    protected getRaidTemperature(currentSeason: Season, inRaidTimestamp: number): number;
+    protected getRaidTemperature(weather: ISeasonalValues, inRaidTimestamp: number): number;
     /**
      * Set IWeather date/time/timestamp values to now
      * @param weather Object to update
      * @param timestamp OPTIONAL, define timestamp used
      */
     protected setCurrentDateTime(weather: IWeather, timestamp?: number): void;
-    protected getWeightedWindDirection(): WindDirection;
-    protected getWeightedClouds(): number;
-    protected getWeightedWindSpeed(): number;
-    protected getWeightedFog(): number;
-    protected getWeightedRain(): number;
-    protected getRandomFloat(node: string, precision?: number): number;
+    protected getWeightedWindDirection(weather: ISeasonalValues): WindDirection;
+    protected getWeightedClouds(weather: ISeasonalValues): number;
+    protected getWeightedWindSpeed(weather: ISeasonalValues): number;
+    protected getWeightedFog(weather: ISeasonalValues): number;
+    protected getWeightedRain(weather: ISeasonalValues): number;
+    protected getRandomFloat(min: number, max: number, precision?: number): number;
 }
diff --git a/types/generators/weapongen/IInventoryMagGen.d.ts b/types/generators/weapongen/IInventoryMagGen.d.ts
index 1a6b0dbf..07bef8ea 100644
--- a/types/generators/weapongen/IInventoryMagGen.d.ts
+++ b/types/generators/weapongen/IInventoryMagGen.d.ts
@@ -1,4 +1,4 @@
-import type { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
+import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
 export interface IInventoryMagGen {
     getPriority(): number;
     canHandleInventoryMagGen(inventoryMagGen: InventoryMagGen): boolean;
diff --git a/types/generators/weapongen/InventoryMagGen.d.ts b/types/generators/weapongen/InventoryMagGen.d.ts
index da3b055e..7e2011dc 100644
--- a/types/generators/weapongen/InventoryMagGen.d.ts
+++ b/types/generators/weapongen/InventoryMagGen.d.ts
@@ -1,6 +1,6 @@
-import type { IInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 export declare class InventoryMagGen {
     private magCounts;
     private magazineTemplate;
diff --git a/types/generators/weapongen/implementations/BarrelInventoryMagGen.d.ts b/types/generators/weapongen/implementations/BarrelInventoryMagGen.d.ts
index 38e3dc9f..caa4d13c 100644
--- a/types/generators/weapongen/implementations/BarrelInventoryMagGen.d.ts
+++ b/types/generators/weapongen/implementations/BarrelInventoryMagGen.d.ts
@@ -1,5 +1,5 @@
-import type { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
-import type { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
+import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
+import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
 import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 export declare class BarrelInventoryMagGen implements IInventoryMagGen {
diff --git a/types/generators/weapongen/implementations/ExternalInventoryMagGen.d.ts b/types/generators/weapongen/implementations/ExternalInventoryMagGen.d.ts
index 63848c4a..0ce653bb 100644
--- a/types/generators/weapongen/implementations/ExternalInventoryMagGen.d.ts
+++ b/types/generators/weapongen/implementations/ExternalInventoryMagGen.d.ts
@@ -1,9 +1,9 @@
-import type { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
+import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
 import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
 import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { RandomUtil } from "@spt/utils/RandomUtil";
diff --git a/types/generators/weapongen/implementations/InternalMagazineInventoryMagGen.d.ts b/types/generators/weapongen/implementations/InternalMagazineInventoryMagGen.d.ts
index 1b5b0905..5ae74150 100644
--- a/types/generators/weapongen/implementations/InternalMagazineInventoryMagGen.d.ts
+++ b/types/generators/weapongen/implementations/InternalMagazineInventoryMagGen.d.ts
@@ -1,5 +1,5 @@
-import type { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
-import type { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
+import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
+import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
 import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
 export declare class InternalMagazineInventoryMagGen implements IInventoryMagGen {
     protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
diff --git a/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts b/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts
index 917c0149..69d0c49c 100644
--- a/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts
+++ b/types/generators/weapongen/implementations/UbglExternalMagGen.d.ts
@@ -1,5 +1,5 @@
-import type { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
-import type { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
+import { IInventoryMagGen } from "@spt/generators/weapongen/IInventoryMagGen";
+import { InventoryMagGen } from "@spt/generators/weapongen/InventoryMagGen";
 import { BotWeaponGeneratorHelper } from "@spt/helpers/BotWeaponGeneratorHelper";
 export declare class UbglExternalMagGen implements IInventoryMagGen {
     protected botWeaponGeneratorHelper: BotWeaponGeneratorHelper;
diff --git a/types/helpers/AssortHelper.d.ts b/types/helpers/AssortHelper.d.ts
index 95ba06ad..163268f4 100644
--- a/types/helpers/AssortHelper.d.ts
+++ b/types/helpers/AssortHelper.d.ts
@@ -1,7 +1,7 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
 import { QuestStatus } from "@spt/models/enums/QuestStatus";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
diff --git a/types/helpers/BotDifficultyHelper.d.ts b/types/helpers/BotDifficultyHelper.d.ts
index c2108eae..f8e97272 100644
--- a/types/helpers/BotDifficultyHelper.d.ts
+++ b/types/helpers/BotDifficultyHelper.d.ts
@@ -1,7 +1,7 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
-import type { IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
-import type { IBots } from "@spt/models/spt/bots/IBots";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
+import { IBots } from "@spt/models/spt/bots/IBots";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/BotGeneratorHelper.d.ts b/types/helpers/BotGeneratorHelper.d.ts
index 63a90e89..62d11b9e 100644
--- a/types/helpers/BotGeneratorHelper.d.ts
+++ b/types/helpers/BotGeneratorHelper.d.ts
@@ -1,15 +1,15 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { ContainerHelper } from "@spt/helpers/ContainerHelper";
 import { DurabilityLimitsHelper } from "@spt/helpers/DurabilityLimitsHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem, IUpd, IUpdRepairable } from "@spt/models/eft/common/tables/IItem";
-import type { IGrid, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem, IUpd, IUpdRepairable } from "@spt/models/eft/common/tables/IItem";
+import { IGrid, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { ItemAddedResult } from "@spt/models/enums/ItemAddedResult";
-import type { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult";
-import type { EquipmentFilters, IBotConfig, IRandomisedResourceValues } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IChooseRandomCompatibleModResult } from "@spt/models/spt/bots/IChooseRandomCompatibleModResult";
+import { EquipmentFilters, IBotConfig, IRandomisedResourceValues } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/BotHelper.d.ts b/types/helpers/BotHelper.d.ts
index 1fade02f..13c6e2bb 100644
--- a/types/helpers/BotHelper.d.ts
+++ b/types/helpers/BotHelper.d.ts
@@ -1,7 +1,7 @@
-import type { MinMax } from "@spt/models/common/MinMax";
-import type { IBotType, IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
-import type { EquipmentFilters, IBotConfig, IRandomisationDetails } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { MinMax } from "@spt/models/common/MinMax";
+import { IBotType, IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
+import { EquipmentFilters, IBotConfig, IRandomisationDetails } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/BotWeaponGeneratorHelper.d.ts b/types/helpers/BotWeaponGeneratorHelper.d.ts
index e3869f4f..d539f005 100644
--- a/types/helpers/BotWeaponGeneratorHelper.d.ts
+++ b/types/helpers/BotWeaponGeneratorHelper.d.ts
@@ -1,10 +1,10 @@
 import { BotGeneratorHelper } from "@spt/helpers/BotGeneratorHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { EquipmentSlots } from "@spt/models/enums/EquipmentSlots";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
diff --git a/types/helpers/Dialogue/AbstractDialogueChatBot.d.ts b/types/helpers/Dialogue/AbstractDialogueChatBot.d.ts
index 5a7e7079..96e4642e 100644
--- a/types/helpers/Dialogue/AbstractDialogueChatBot.d.ts
+++ b/types/helpers/Dialogue/AbstractDialogueChatBot.d.ts
@@ -1,8 +1,8 @@
-import type { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand";
-import type { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
-import type { ILogger } from "@spt/models/spt/utils/ILogger";
+import { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand";
+import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { MailSendService } from "@spt/services/MailSendService";
 export declare abstract class AbstractDialogueChatBot implements IDialogueChatBot {
     protected logger: ILogger;
diff --git a/types/helpers/Dialogue/Commando/IChatCommand.d.ts b/types/helpers/Dialogue/Commando/IChatCommand.d.ts
index cfcf8659..8365118e 100644
--- a/types/helpers/Dialogue/Commando/IChatCommand.d.ts
+++ b/types/helpers/Dialogue/Commando/IChatCommand.d.ts
@@ -1,5 +1,5 @@
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 export interface IChatCommand {
     getCommandPrefix(): string;
     getCommandHelp(command: string): string;
diff --git a/types/helpers/Dialogue/Commando/SptCommandoCommands.d.ts b/types/helpers/Dialogue/Commando/SptCommandoCommands.d.ts
index f7ac02ab..af8443c1 100644
--- a/types/helpers/Dialogue/Commando/SptCommandoCommands.d.ts
+++ b/types/helpers/Dialogue/Commando/SptCommandoCommands.d.ts
@@ -1,7 +1,7 @@
-import type { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand";
-import type { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand";
+import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
 export declare class SptCommandoCommands implements IChatCommand {
diff --git a/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts
index 873511f1..4b2b81ac 100644
--- a/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts
+++ b/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts
@@ -1,13 +1,13 @@
 import { SavedCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand";
-import type { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocaleService } from "@spt/services/LocaleService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { HashUtil } from "@spt/utils/HashUtil";
diff --git a/types/helpers/Dialogue/Commando/SptCommands/ISptCommand.d.ts b/types/helpers/Dialogue/Commando/SptCommands/ISptCommand.d.ts
index 2fc932c8..0368d414 100644
--- a/types/helpers/Dialogue/Commando/SptCommands/ISptCommand.d.ts
+++ b/types/helpers/Dialogue/Commando/SptCommands/ISptCommand.d.ts
@@ -1,5 +1,5 @@
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 export interface ISptCommand {
     getCommand(): string;
     getCommandHelp(): string;
diff --git a/types/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.d.ts b/types/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.d.ts
index 9b90cddf..4c516cb7 100644
--- a/types/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.d.ts
+++ b/types/helpers/Dialogue/Commando/SptCommands/ProfileCommand/ProfileSptCommand.d.ts
@@ -1,11 +1,11 @@
 import { SavedCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand";
-import type { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
-import type { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
+import { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocaleService } from "@spt/services/LocaleService";
diff --git a/types/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.d.ts b/types/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.d.ts
index 173d5868..6f64afb6 100644
--- a/types/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.d.ts
+++ b/types/helpers/Dialogue/Commando/SptCommands/TraderCommand/TraderSptCommand.d.ts
@@ -1,9 +1,9 @@
 import { SavedCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/GiveCommand/SavedCommand";
-import type { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ISptCommand } from "@spt/helpers/Dialogue/Commando/SptCommands/ISptCommand";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocaleService } from "@spt/services/LocaleService";
diff --git a/types/helpers/Dialogue/CommandoDialogueChatBot.d.ts b/types/helpers/Dialogue/CommandoDialogueChatBot.d.ts
index 182d2eaa..ec2ccf86 100644
--- a/types/helpers/Dialogue/CommandoDialogueChatBot.d.ts
+++ b/types/helpers/Dialogue/CommandoDialogueChatBot.d.ts
@@ -1,6 +1,6 @@
 import { AbstractDialogueChatBot } from "@spt/helpers/Dialogue/AbstractDialogueChatBot";
-import type { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IChatCommand } from "@spt/helpers/Dialogue/Commando/IChatCommand";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { MailSendService } from "@spt/services/MailSendService";
 export declare class CommandoDialogueChatBot extends AbstractDialogueChatBot {
diff --git a/types/helpers/Dialogue/IDialogueChatBot.d.ts b/types/helpers/Dialogue/IDialogueChatBot.d.ts
index 4b837341..116f19c2 100644
--- a/types/helpers/Dialogue/IDialogueChatBot.d.ts
+++ b/types/helpers/Dialogue/IDialogueChatBot.d.ts
@@ -1,5 +1,5 @@
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 export interface IDialogueChatBot {
     getChatBot(): IUserDialogInfo;
     handleMessage(sessionId: string, request: ISendMessageRequest): string;
diff --git a/types/helpers/Dialogue/SptDialogueChatBot.d.ts b/types/helpers/Dialogue/SptDialogueChatBot.d.ts
index a6b90efe..421fe22e 100644
--- a/types/helpers/Dialogue/SptDialogueChatBot.d.ts
+++ b/types/helpers/Dialogue/SptDialogueChatBot.d.ts
@@ -1,9 +1,9 @@
-import type { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
+import { IDialogueChatBot } from "@spt/helpers/Dialogue/IDialogueChatBot";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
-import type { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { GiftService } from "@spt/services/GiftService";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/helpers/DialogueHelper.d.ts b/types/helpers/DialogueHelper.d.ts
index 44cf4925..97d94176 100644
--- a/types/helpers/DialogueHelper.d.ts
+++ b/types/helpers/DialogueHelper.d.ts
@@ -1,8 +1,8 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper";
 import { NotifierHelper } from "@spt/helpers/NotifierHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IDialogue, IMessagePreview } from "@spt/models/eft/profile/ISptProfile";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IDialogue, IMessagePreview } from "@spt/models/eft/profile/ISptProfile";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/helpers/DurabilityLimitsHelper.d.ts b/types/helpers/DurabilityLimitsHelper.d.ts
index 2e817fba..e3b40868 100644
--- a/types/helpers/DurabilityLimitsHelper.d.ts
+++ b/types/helpers/DurabilityLimitsHelper.d.ts
@@ -1,6 +1,6 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 export declare class DurabilityLimitsHelper {
diff --git a/types/helpers/GameEventHelper.d.ts b/types/helpers/GameEventHelper.d.ts
index bfb44c36..b15a15d7 100644
--- a/types/helpers/GameEventHelper.d.ts
+++ b/types/helpers/GameEventHelper.d.ts
@@ -1,4 +1,4 @@
-import type { ISeasonalEventConfig } from "@spt/models/spt/config/ISeasonalEventConfig";
+import { ISeasonalEventConfig } from "@spt/models/spt/config/ISeasonalEventConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 export declare class GameEventHelper {
diff --git a/types/helpers/HandbookHelper.d.ts b/types/helpers/HandbookHelper.d.ts
index ad1b571b..b1e6607f 100644
--- a/types/helpers/HandbookHelper.d.ts
+++ b/types/helpers/HandbookHelper.d.ts
@@ -1,6 +1,6 @@
-import type { IHandbookCategory } from "@spt/models/eft/common/tables/IHandbookBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IItemConfig } from "@spt/models/spt/config/IItemConfig";
+import { IHandbookCategory } from "@spt/models/eft/common/tables/IHandbookBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItemConfig } from "@spt/models/spt/config/IItemConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import type { ICloner } from "@spt/utils/cloners/ICloner";
diff --git a/types/helpers/HealthHelper.d.ts b/types/helpers/HealthHelper.d.ts
index 1a9ea8ef..aef8ca35 100644
--- a/types/helpers/HealthHelper.d.ts
+++ b/types/helpers/HealthHelper.d.ts
@@ -1,21 +1,23 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBodyPartsHealth, IHealth } from "@spt/models/eft/common/tables/IBotBase";
-import type { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData";
-import type { IEffects, ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IHealthConfig } from "@spt/models/spt/config/IHealthConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBodyPartsHealth, IHealth } from "@spt/models/eft/common/tables/IBotBase";
+import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData";
+import { IEffects, ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
+import { DatabaseService } from "@spt/services/DatabaseService";
 import { TimeUtil } from "@spt/utils/TimeUtil";
 import type { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HealthHelper {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
     protected saveServer: SaveServer;
+    protected databaseService: DatabaseService;
     protected configServer: ConfigServer;
     protected cloner: ICloner;
     protected healthConfig: IHealthConfig;
-    constructor(logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, configServer: ConfigServer, cloner: ICloner);
+    constructor(logger: ILogger, timeUtil: TimeUtil, saveServer: SaveServer, databaseService: DatabaseService, configServer: ConfigServer, cloner: ICloner);
     /**
      * Resets the profiles vitality/health and vitality/effects properties to their defaults
      * @param sessionID Session Id
diff --git a/types/helpers/HideoutHelper.d.ts b/types/helpers/HideoutHelper.d.ts
index 46a1422a..814c8676 100644
--- a/types/helpers/HideoutHelper.d.ts
+++ b/types/helpers/HideoutHelper.d.ts
@@ -1,18 +1,18 @@
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBotHideoutArea, IHideoutImprovement, IProduction, IProductive } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem, IUpd } from "@spt/models/eft/common/tables/IItem";
-import type { IHideoutArea, IStageBonus } from "@spt/models/eft/hideout/IHideoutArea";
-import type { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData";
-import type { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import type { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import type { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBotHideoutArea, IHideoutImprovement, IProduction, IProductive } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem, IUpd } from "@spt/models/eft/common/tables/IItem";
+import { IHideoutArea, IStageBonus } from "@spt/models/eft/hideout/IHideoutArea";
+import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData";
+import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
 import { SkillTypes } from "@spt/models/enums/SkillTypes";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/helpers/HttpServerHelper.d.ts b/types/helpers/HttpServerHelper.d.ts
index 8da2eae0..9d5e6df7 100644
--- a/types/helpers/HttpServerHelper.d.ts
+++ b/types/helpers/HttpServerHelper.d.ts
@@ -1,4 +1,4 @@
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class HttpServerHelper {
     protected configServer: ConfigServer;
diff --git a/types/helpers/InRaidHelper.d.ts b/types/helpers/InRaidHelper.d.ts
index 8c6d90fc..3599386e 100644
--- a/types/helpers/InRaidHelper.d.ts
+++ b/types/helpers/InRaidHelper.d.ts
@@ -1,10 +1,10 @@
 import { QuestController } from "@spt/controllers/QuestController";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
-import type { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
+import { ILostOnDeathConfig } from "@spt/models/spt/config/ILostOnDeathConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/InventoryHelper.d.ts b/types/helpers/InventoryHelper.d.ts
index 6bac32c5..2838c16c 100644
--- a/types/helpers/InventoryHelper.d.ts
+++ b/types/helpers/InventoryHelper.d.ts
@@ -1,23 +1,23 @@
 import { ContainerHelper } from "@spt/helpers/ContainerHelper";
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem, IItemLocation, IUpd } from "@spt/models/eft/common/tables/IItem";
-import type { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest";
-import type { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest";
-import type { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
-import type { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
-import type { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
-import type { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
-import type { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IInventoryConfig, IRewardDetails } from "@spt/models/spt/config/IInventoryConfig";
-import type { IOwnerInventoryItems } from "@spt/models/spt/inventory/IOwnerInventoryItems";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem, IItemLocation, IUpd } from "@spt/models/eft/common/tables/IItem";
+import { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest";
+import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest";
+import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
+import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IInventoryConfig, IRewardDetails } from "@spt/models/spt/config/IInventoryConfig";
+import { IOwnerInventoryItems } from "@spt/models/spt/inventory/IOwnerInventoryItems";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
diff --git a/types/helpers/ItemHelper.d.ts b/types/helpers/ItemHelper.d.ts
index 86901fc3..804b829d 100644
--- a/types/helpers/ItemHelper.d.ts
+++ b/types/helpers/ItemHelper.d.ts
@@ -1,14 +1,14 @@
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { IStaticAmmoDetails } from "@spt/models/eft/common/ILocation";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IInsuredItem } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem, IUpd, IUpdRepairable } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IStaticAmmoDetails } from "@spt/models/eft/common/ILocation";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInsuredItem } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem, IUpd, IUpdRepairable } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { ItemTpl } from "@spt/models/enums/ItemTpl";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocaleService } from "@spt/services/LocaleService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { CompareUtil } from "@spt/utils/CompareUtil";
diff --git a/types/helpers/NotificationSendHelper.d.ts b/types/helpers/NotificationSendHelper.d.ts
index 34d0c1d5..fbed6fcc 100644
--- a/types/helpers/NotificationSendHelper.d.ts
+++ b/types/helpers/NotificationSendHelper.d.ts
@@ -1,5 +1,6 @@
-import type { IDialogue, IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IDialogue } from "@spt/models/eft/profile/ISptProfile";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 import { MessageType } from "@spt/models/enums/MessageType";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { SptWebSocketConnectionHandler } from "@spt/servers/ws/SptWebSocketConnectionHandler";
diff --git a/types/helpers/NotifierHelper.d.ts b/types/helpers/NotifierHelper.d.ts
index 1795ce8a..d41bc2f1 100644
--- a/types/helpers/NotifierHelper.d.ts
+++ b/types/helpers/NotifierHelper.d.ts
@@ -1,8 +1,9 @@
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
-import type { IMessage, IMessageContentRagfair } from "@spt/models/eft/profile/ISptProfile";
-import type { IWsChatMessageReceived } from "@spt/models/eft/ws/IWsChatMessageReceived";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
-import type { IWsRagfairOfferSold } from "@spt/models/eft/ws/IWsRagfairOfferSold";
+import { IMessageContentRagfair } from "@spt/models/eft/profile/IMessageContentRagfair";
+import { IMessage } from "@spt/models/eft/profile/ISptProfile";
+import { IWsChatMessageReceived } from "@spt/models/eft/ws/IWsChatMessageReceived";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsRagfairOfferSold } from "@spt/models/eft/ws/IWsRagfairOfferSold";
 export declare class NotifierHelper {
     protected httpServerHelper: HttpServerHelper;
     /**
diff --git a/types/helpers/PaymentHelper.d.ts b/types/helpers/PaymentHelper.d.ts
index 0fa63067..6971547f 100644
--- a/types/helpers/PaymentHelper.d.ts
+++ b/types/helpers/PaymentHelper.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class PaymentHelper {
     protected configServer: ConfigServer;
diff --git a/types/helpers/PresetHelper.d.ts b/types/helpers/PresetHelper.d.ts
index e47a140c..c22dd94b 100644
--- a/types/helpers/PresetHelper.d.ts
+++ b/types/helpers/PresetHelper.d.ts
@@ -1,5 +1,5 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IPreset } from "@spt/models/eft/common/IGlobals";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
 import { BaseClasses } from "@spt/models/enums/BaseClasses";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import type { ICloner } from "@spt/utils/cloners/ICloner";
diff --git a/types/helpers/ProfileHelper.d.ts b/types/helpers/ProfileHelper.d.ts
index 9587d6e3..a31ef868 100644
--- a/types/helpers/ProfileHelper.d.ts
+++ b/types/helpers/ProfileHelper.d.ts
@@ -1,13 +1,13 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { Common, ICounterKeyValue, IStats } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Common, ICounterKeyValue, IStats } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
+import { ISpt, ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
 import { BonusType } from "@spt/models/enums/BonusType";
 import { SkillTypes } from "@spt/models/enums/SkillTypes";
-import type { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
@@ -84,7 +84,7 @@ export declare class ProfileHelper {
      * @returns Max level
      */
     getMaxLevel(): number;
-    getDefaultSptDataObject(): any;
+    getDefaultSptDataObject(): ISpt;
     /**
      * Get full representation of a players profile json
      * @param sessionID Profile id to get
diff --git a/types/helpers/QuestConditionHelper.d.ts b/types/helpers/QuestConditionHelper.d.ts
index c9b04152..c50a9c38 100644
--- a/types/helpers/QuestConditionHelper.d.ts
+++ b/types/helpers/QuestConditionHelper.d.ts
@@ -1,4 +1,4 @@
-import type { IQuestCondition } from "@spt/models/eft/common/tables/IQuest";
+import { IQuestCondition } from "@spt/models/eft/common/tables/IQuest";
 export declare class QuestConditionHelper {
     getQuestConditions(q: IQuestCondition[], furtherFilter?: (a: IQuestCondition) => IQuestCondition[]): IQuestCondition[];
     getLevelConditions(q: IQuestCondition[], furtherFilter?: (a: IQuestCondition) => IQuestCondition[]): IQuestCondition[];
diff --git a/types/helpers/QuestHelper.d.ts b/types/helpers/QuestHelper.d.ts
index a8fef8df..dc542d94 100644
--- a/types/helpers/QuestHelper.d.ts
+++ b/types/helpers/QuestHelper.d.ts
@@ -1,22 +1,22 @@
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestConditionHelper } from "@spt/helpers/QuestConditionHelper";
 import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { Common, IQuestStatus } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IQuest, IQuestCondition, IQuestReward } from "@spt/models/eft/common/tables/IQuest";
-import type { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
-import type { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
-import type { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Common, IQuestStatus } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IQuest, IQuestCondition, IQuestReward } from "@spt/models/eft/common/tables/IQuest";
+import { IHideoutProduction } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
+import { IFailQuestRequestData } from "@spt/models/eft/quests/IFailQuestRequestData";
 import { QuestStatus } from "@spt/models/enums/QuestStatus";
-import type { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/helpers/RagfairHelper.d.ts b/types/helpers/RagfairHelper.d.ts
index 544872c7..9ad63a95 100644
--- a/types/helpers/RagfairHelper.d.ts
+++ b/types/helpers/RagfairHelper.d.ts
@@ -1,11 +1,11 @@
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper";
 import { UtilityHelper } from "@spt/helpers/UtilityHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
-import type { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/RagfairOfferHelper.d.ts b/types/helpers/RagfairOfferHelper.d.ts
index 65bca731..fadc5b6f 100644
--- a/types/helpers/RagfairOfferHelper.d.ts
+++ b/types/helpers/RagfairOfferHelper.d.ts
@@ -1,5 +1,5 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
@@ -8,16 +8,16 @@ import { RagfairHelper } from "@spt/helpers/RagfairHelper";
 import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper";
 import { RagfairSortHelper } from "@spt/helpers/RagfairSortHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import { type ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
-import type { IRagfairConfig, ITieredFlea } from "@spt/models/spt/config/IRagfairConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IRagfairConfig, ITieredFlea } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/helpers/RagfairSellHelper.d.ts b/types/helpers/RagfairSellHelper.d.ts
index 025c9773..9976ae6a 100644
--- a/types/helpers/RagfairSellHelper.d.ts
+++ b/types/helpers/RagfairSellHelper.d.ts
@@ -1,5 +1,5 @@
-import type { ISellResult } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ISellResult } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/RagfairServerHelper.d.ts b/types/helpers/RagfairServerHelper.d.ts
index f8d55060..8705f99f 100644
--- a/types/helpers/RagfairServerHelper.d.ts
+++ b/types/helpers/RagfairServerHelper.d.ts
@@ -1,15 +1,15 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { RandomUtil } from "@spt/utils/RandomUtil";
diff --git a/types/helpers/RagfairSortHelper.d.ts b/types/helpers/RagfairSortHelper.d.ts
index 8a6006b4..99715597 100644
--- a/types/helpers/RagfairSortHelper.d.ts
+++ b/types/helpers/RagfairSortHelper.d.ts
@@ -1,4 +1,4 @@
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 import { RagfairSort } from "@spt/models/enums/RagfairSort";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocaleService } from "@spt/services/LocaleService";
diff --git a/types/helpers/RepairHelper.d.ts b/types/helpers/RepairHelper.d.ts
index 089b89fd..4512454b 100644
--- a/types/helpers/RepairHelper.d.ts
+++ b/types/helpers/RepairHelper.d.ts
@@ -1,6 +1,6 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/RepeatableQuestHelper.d.ts b/types/helpers/RepeatableQuestHelper.d.ts
index 96e214ce..b67bb9b2 100644
--- a/types/helpers/RepeatableQuestHelper.d.ts
+++ b/types/helpers/RepeatableQuestHelper.d.ts
@@ -1,4 +1,4 @@
-import type { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil";
diff --git a/types/helpers/SecureContainerHelper.d.ts b/types/helpers/SecureContainerHelper.d.ts
index 3abe3d47..76844860 100644
--- a/types/helpers/SecureContainerHelper.d.ts
+++ b/types/helpers/SecureContainerHelper.d.ts
@@ -1,5 +1,5 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IOwnerInventoryItems {
     from: IItem[];
     to: IItem[];
diff --git a/types/helpers/TradeHelper.d.ts b/types/helpers/TradeHelper.d.ts
index 085f9c46..35ce10bd 100644
--- a/types/helpers/TradeHelper.d.ts
+++ b/types/helpers/TradeHelper.d.ts
@@ -1,14 +1,14 @@
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
-import type { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
-import type { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
+import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/helpers/TraderAssortHelper.d.ts b/types/helpers/TraderAssortHelper.d.ts
index da80c61f..0688a372 100644
--- a/types/helpers/TraderAssortHelper.d.ts
+++ b/types/helpers/TraderAssortHelper.d.ts
@@ -4,9 +4,9 @@ import { AssortHelper } from "@spt/helpers/AssortHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITrader, ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/TraderHelper.d.ts b/types/helpers/TraderHelper.d.ts
index 59a72d97..579d8a7f 100644
--- a/types/helpers/TraderHelper.d.ts
+++ b/types/helpers/TraderHelper.d.ts
@@ -1,13 +1,13 @@
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IProfileTraderTemplate } from "@spt/models/eft/common/tables/IProfileTemplate";
-import type { ITraderAssort, ITraderBase, ITraderLoyaltyLevel } from "@spt/models/eft/common/tables/ITrader";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IProfileTraderTemplate } from "@spt/models/eft/common/tables/IProfileTemplate";
+import { ITraderAssort, ITraderBase, ITraderLoyaltyLevel } from "@spt/models/eft/common/tables/ITrader";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 import { Traders } from "@spt/models/enums/Traders";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/helpers/WeatherHelper.d.ts b/types/helpers/WeatherHelper.d.ts
index 0f058279..f5cabe6d 100644
--- a/types/helpers/WeatherHelper.d.ts
+++ b/types/helpers/WeatherHelper.d.ts
@@ -1,5 +1,5 @@
 import { DateTime } from "@spt/models/enums/DateTime";
-import type { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { TimeUtil } from "@spt/utils/TimeUtil";
diff --git a/types/ide/bleedingEdge.d.ts b/types/ide/bleedingEdge.d.ts
deleted file mode 100644
index 57103f4c..00000000
--- a/types/ide/bleedingEdge.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js";
-import "reflect-metadata";
diff --git a/types/ide/bleedingEdgeMods.d.ts b/types/ide/bleedingEdgeMods.d.ts
deleted file mode 100644
index 57103f4c..00000000
--- a/types/ide/bleedingEdgeMods.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js";
-import "reflect-metadata";
diff --git a/types/ide/debug.d.ts b/types/ide/debug.d.ts
deleted file mode 100644
index 57103f4c..00000000
--- a/types/ide/debug.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js";
-import "reflect-metadata";
diff --git a/types/ide/local.d.ts b/types/ide/local.d.ts
deleted file mode 100644
index 57103f4c..00000000
--- a/types/ide/local.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js";
-import "reflect-metadata";
diff --git a/types/ide/release.d.ts b/types/ide/release.d.ts
deleted file mode 100644
index 57103f4c..00000000
--- a/types/ide/release.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import "core-js";
-import "reflect-metadata";
diff --git a/types/loaders/ModLoadOrder.d.ts b/types/loaders/ModLoadOrder.d.ts
index 966aaac5..126ffc4d 100644
--- a/types/loaders/ModLoadOrder.d.ts
+++ b/types/loaders/ModLoadOrder.d.ts
@@ -1,4 +1,4 @@
-import type { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
+import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
 export declare class ModLoadOrder {
diff --git a/types/loaders/ModTypeCheck.d.ts b/types/loaders/ModTypeCheck.d.ts
index bf075ed5..f66ec458 100644
--- a/types/loaders/ModTypeCheck.d.ts
+++ b/types/loaders/ModTypeCheck.d.ts
@@ -1,9 +1,9 @@
-import type { IPostDBLoadMod } from "@spt/models/external/IPostDBLoadMod";
-import type { IPostDBLoadModAsync } from "@spt/models/external/IPostDBLoadModAsync";
-import type { IPostSptLoadMod } from "@spt/models/external/IPostSptLoadMod";
-import type { IPostSptLoadModAsync } from "@spt/models/external/IPostSptLoadModAsync";
-import type { IPreSptLoadMod } from "@spt/models/external/IPreSptLoadMod";
-import type { IPreSptLoadModAsync } from "@spt/models/external/IPreSptLoadModAsync";
+import { IPostDBLoadMod } from "@spt/models/external/IPostDBLoadMod";
+import { IPostDBLoadModAsync } from "@spt/models/external/IPostDBLoadModAsync";
+import { IPostSptLoadMod } from "@spt/models/external/IPostSptLoadMod";
+import { IPostSptLoadModAsync } from "@spt/models/external/IPostSptLoadModAsync";
+import { IPreSptLoadMod } from "@spt/models/external/IPreSptLoadMod";
+import { IPreSptLoadModAsync } from "@spt/models/external/IPreSptLoadModAsync";
 export declare class ModTypeCheck {
     /**
      * Use defined safe guard to check if the mod is a IPreSptLoadMod
diff --git a/types/loaders/PostDBModLoader.d.ts b/types/loaders/PostDBModLoader.d.ts
index 38329a97..230e0e82 100644
--- a/types/loaders/PostDBModLoader.d.ts
+++ b/types/loaders/PostDBModLoader.d.ts
@@ -1,10 +1,10 @@
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 import { BundleLoader } from "@spt/loaders/BundleLoader";
 import { ModTypeCheck } from "@spt/loaders/ModTypeCheck";
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import type { DependencyContainer } from "tsyringe";
+import { DependencyContainer } from "tsyringe";
 export declare class PostDBModLoader implements OnLoad {
     protected logger: ILogger;
     protected bundleLoader: BundleLoader;
diff --git a/types/loaders/PostSptModLoader.d.ts b/types/loaders/PostSptModLoader.d.ts
index 34a22124..ce02245d 100644
--- a/types/loaders/PostSptModLoader.d.ts
+++ b/types/loaders/PostSptModLoader.d.ts
@@ -1,9 +1,9 @@
 import { ModTypeCheck } from "@spt/loaders/ModTypeCheck";
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
-import type { IModLoader } from "@spt/models/spt/mod/IModLoader";
+import { IModLoader } from "@spt/models/spt/mod/IModLoader";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import type { DependencyContainer } from "tsyringe";
+import { DependencyContainer } from "tsyringe";
 export declare class PostSptModLoader implements IModLoader {
     protected logger: ILogger;
     protected preSptModLoader: PreSptModLoader;
diff --git a/types/loaders/PreSptModLoader.d.ts b/types/loaders/PreSptModLoader.d.ts
index 6ff71d93..a8461487 100644
--- a/types/loaders/PreSptModLoader.d.ts
+++ b/types/loaders/PreSptModLoader.d.ts
@@ -1,16 +1,16 @@
 import { ModLoadOrder } from "@spt/loaders/ModLoadOrder";
 import { ModTypeCheck } from "@spt/loaders/ModTypeCheck";
-import type { IModDetails } from "@spt/models/eft/profile/ISptProfile";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
-import type { IModLoader } from "@spt/models/spt/mod/IModLoader";
-import type { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
+import { IModDetails } from "@spt/models/eft/profile/ISptProfile";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IModLoader } from "@spt/models/spt/mod/IModLoader";
+import { IPackageJsonData } from "@spt/models/spt/mod/IPackageJsonData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { ModCompilerService } from "@spt/services/ModCompilerService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { VFS } from "@spt/utils/VFS";
-import type { DependencyContainer } from "tsyringe";
+import { DependencyContainer } from "tsyringe";
 export declare class PreSptModLoader implements IModLoader {
     protected logger: ILogger;
     protected vfs: VFS;
diff --git a/types/models/eft/builds/ISetMagazineRequest.d.ts b/types/models/eft/builds/ISetMagazineRequest.d.ts
index b9aaa598..d3d14794 100644
--- a/types/models/eft/builds/ISetMagazineRequest.d.ts
+++ b/types/models/eft/builds/ISetMagazineRequest.d.ts
@@ -1,4 +1,4 @@
-import type { IMagazineTemplateAmmoItem } from "@spt/models/eft/profile/ISptProfile";
+import { IMagazineTemplateAmmoItem } from "@spt/models/eft/profile/ISptProfile";
 export interface ISetMagazineRequest {
     Id: string;
     Name: string;
diff --git a/types/models/eft/common/IGlobals.d.ts b/types/models/eft/common/IGlobals.d.ts
index ccd9a62c..ee97d7f1 100644
--- a/types/models/eft/common/IGlobals.d.ts
+++ b/types/models/eft/common/IGlobals.d.ts
@@ -1056,6 +1056,7 @@ export interface IRagFair {
     delaySinceOfferAdd: number;
     uniqueBuyerTimeoutInDays: number;
     userRatingChangeFrequencyMultiplayer: number;
+    RagfairTurnOnTimestamp: number;
     ratingSumForIncrease: number;
     ratingIncreaseCount: number;
     ratingSumForDecrease: number;
diff --git a/types/models/eft/common/ILocation.d.ts b/types/models/eft/common/ILocation.d.ts
index f872be91..15a495c7 100644
--- a/types/models/eft/common/ILocation.d.ts
+++ b/types/models/eft/common/ILocation.d.ts
@@ -1,7 +1,7 @@
-import type { IExit, ILocationBase } from "@spt/models/eft/common/ILocationBase";
-import type { IGroupPostion, ILooseLoot } from "@spt/models/eft/common/ILooseLoot";
-import type { Ixyz } from "@spt/models/eft/common/Ixyz";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IExit, ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { IGroupPostion, ILooseLoot } from "@spt/models/eft/common/ILooseLoot";
+import { Ixyz } from "@spt/models/eft/common/Ixyz";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface ILocation {
     /** Map meta-data */
     base: ILocationBase;
diff --git a/types/models/eft/common/ILocationBase.d.ts b/types/models/eft/common/ILocationBase.d.ts
index 9f2e6baa..ff47f277 100644
--- a/types/models/eft/common/ILocationBase.d.ts
+++ b/types/models/eft/common/ILocationBase.d.ts
@@ -1,5 +1,5 @@
 import type { MinMax } from "@spt/models/common/MinMax";
-import type { Ixyz } from "@spt/models/eft/common/Ixyz";
+import type { Ixy, Ixyz } from "@spt/models/eft/common/Ixyz";
 import type { ISpawnpointTemplate } from "./ILooseLoot";
 export interface ILocationBase {
     AccessKeys: string[];
@@ -86,6 +86,7 @@ export interface ILocationBase {
     SpawnPointParams: ISpawnPointParam[];
     UnixDateTime: number;
     _Id: string;
+    areas: Record<string, IAreaLocationSpawn>;
     doors: any[];
     EscapeTimeLimit: number;
     EscapeTimeLimitCoop: number;
@@ -111,6 +112,14 @@ export interface ILocationBase {
     waves: IWave[];
     secretExits: ISecretExit[];
 }
+export interface IAreaLocationSpawn {
+    center: Ixy;
+    infiltrationZone: string;
+    orientation: number;
+    position: Ixy;
+    sides: string[];
+    size: Ixy;
+}
 export interface ISecretExit {
     EligibleForPMC: boolean;
     EligibleForScav: boolean;
diff --git a/types/models/eft/common/ILocationsSourceDestinationBase.d.ts b/types/models/eft/common/ILocationsSourceDestinationBase.d.ts
index 2bfadadc..a85ee96e 100644
--- a/types/models/eft/common/ILocationsSourceDestinationBase.d.ts
+++ b/types/models/eft/common/ILocationsSourceDestinationBase.d.ts
@@ -1,9 +1,6 @@
-import type { ILocations } from "@spt/models/spt/server/ILocations";
+import { IPath } from "@spt/models/eft/common/tables/ILocationsBase";
+import { ILocations } from "@spt/models/spt/server/ILocations";
 export interface ILocationsGenerateAllResponse {
     locations: ILocations;
     paths: IPath[];
 }
-export interface IPath {
-    Source: string;
-    Destination: string;
-}
diff --git a/types/models/eft/common/ILooseLoot.d.ts b/types/models/eft/common/ILooseLoot.d.ts
index 50fafb82..392a48cd 100644
--- a/types/models/eft/common/ILooseLoot.d.ts
+++ b/types/models/eft/common/ILooseLoot.d.ts
@@ -1,5 +1,5 @@
-import type { Ixyz } from "@spt/models/eft/common/Ixyz";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { Ixyz } from "@spt/models/eft/common/Ixyz";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface ILooseLoot {
     spawnpointCount: ISpawnpointCount;
     spawnpointsForced: ISpawnpointsForced[];
diff --git a/types/models/eft/common/IPmcData.d.ts b/types/models/eft/common/IPmcData.d.ts
index f7561fb9..313a92c6 100644
--- a/types/models/eft/common/IPmcData.d.ts
+++ b/types/models/eft/common/IPmcData.d.ts
@@ -1,4 +1,4 @@
-import type { IBotBase, IEftStats } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotBase, IEftStats } from "@spt/models/eft/common/tables/IBotBase";
 export interface IPmcData extends IBotBase {
 }
 export interface IPostRaidPmcData extends IBotBase {
diff --git a/types/models/eft/common/tables/IAchievement.d.ts b/types/models/eft/common/tables/IAchievement.d.ts
index 940bf639..7669e005 100644
--- a/types/models/eft/common/tables/IAchievement.d.ts
+++ b/types/models/eft/common/tables/IAchievement.d.ts
@@ -1,4 +1,4 @@
-import type { IQuestConditionTypes, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
+import { IQuestConditionTypes, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
 export interface IAchievement {
     id: string;
     imageUrl: string;
diff --git a/types/models/eft/common/tables/IBotBase.d.ts b/types/models/eft/common/tables/IBotBase.d.ts
index adfb853a..8449e80d 100644
--- a/types/models/eft/common/tables/IBotBase.d.ts
+++ b/types/models/eft/common/tables/IBotBase.d.ts
@@ -1,6 +1,6 @@
-import type { IItem, IUpd } from "@spt/models/eft/common/tables/IItem";
-import type { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IItem, IUpd } from "@spt/models/eft/common/tables/IItem";
+import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 import { BonusSkillType } from "@spt/models/enums/BonusSkillType";
 import { BonusType } from "@spt/models/enums/BonusType";
 import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
diff --git a/types/models/eft/common/tables/IBotType.d.ts b/types/models/eft/common/tables/IBotType.d.ts
index ac96736c..75811048 100644
--- a/types/models/eft/common/tables/IBotType.d.ts
+++ b/types/models/eft/common/tables/IBotType.d.ts
@@ -1,5 +1,5 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { ISkills } from "@spt/models/eft/common/tables/IBotBase";
+import { ISkills } from "@spt/models/eft/common/tables/IBotBase";
 export interface IBotType {
     appearance: IAppearance;
     chances: IChances;
diff --git a/types/models/eft/common/tables/ICustomizationItem.d.ts b/types/models/eft/common/tables/ICustomizationItem.d.ts
index 3937a938..97c7e4d7 100644
--- a/types/models/eft/common/tables/ICustomizationItem.d.ts
+++ b/types/models/eft/common/tables/ICustomizationItem.d.ts
@@ -1,4 +1,4 @@
-import type { Ixyz } from "@spt/models/eft/common/Ixyz";
+import { Ixyz } from "@spt/models/eft/common/Ixyz";
 export interface ICustomizationItem {
     _id: string;
     _name: string;
diff --git a/types/models/eft/common/tables/ILocationServices.d.ts b/types/models/eft/common/tables/ILocationServices.d.ts
index 814598c6..399ae7b0 100644
--- a/types/models/eft/common/tables/ILocationServices.d.ts
+++ b/types/models/eft/common/tables/ILocationServices.d.ts
@@ -1,4 +1,4 @@
-import type { Ixyz } from "@spt/models/eft/common/Ixyz";
+import { Ixyz } from "@spt/models/eft/common/Ixyz";
 export interface ILocationServices {
     TraderServerSettings: ITraderServerSettings;
     BTRServerSettings: IBtrServerSettings;
diff --git a/types/models/eft/common/tables/ILocationsBase.d.ts b/types/models/eft/common/tables/ILocationsBase.d.ts
index e7730967..08446d1f 100644
--- a/types/models/eft/common/tables/ILocationsBase.d.ts
+++ b/types/models/eft/common/tables/ILocationsBase.d.ts
@@ -1,9 +1,9 @@
 export interface ILocationsBase {
-    locations: ILocations;
+    locations: any;
     paths: IPath[];
 }
-export type ILocations = {};
 export interface IPath {
     Source: string;
+    Event: boolean;
     Destination: string;
 }
diff --git a/types/models/eft/common/tables/IPrestige.d.ts b/types/models/eft/common/tables/IPrestige.d.ts
index b8e914fe..128269e4 100644
--- a/types/models/eft/common/tables/IPrestige.d.ts
+++ b/types/models/eft/common/tables/IPrestige.d.ts
@@ -1,5 +1,8 @@
 import type { IQuestCondition, IQuestReward } from "./IQuest";
 export interface IPrestige {
+    elements: IPretigeElement;
+}
+export interface IPretigeElement {
     id: string;
     conditions: IQuestCondition[];
     rewards: IQuestReward[];
diff --git a/types/models/eft/common/tables/IProfileTemplate.d.ts b/types/models/eft/common/tables/IProfileTemplate.d.ts
index 0360494a..0eb800a0 100644
--- a/types/models/eft/common/tables/IProfileTemplate.d.ts
+++ b/types/models/eft/common/tables/IProfileTemplate.d.ts
@@ -1,5 +1,5 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IDialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IDialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
 export interface IProfileTemplates {
     Standard: IProfileSides;
     "Left Behind": IProfileSides;
diff --git a/types/models/eft/common/tables/IQuest.d.ts b/types/models/eft/common/tables/IQuest.d.ts
index 2d36693b..4ced8ff7 100644
--- a/types/models/eft/common/tables/IQuest.d.ts
+++ b/types/models/eft/common/tables/IQuest.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { QuestRewardType } from "@spt/models/enums/QuestRewardType";
 import { QuestStatus } from "@spt/models/enums/QuestStatus";
 import { QuestTypeEnum } from "@spt/models/enums/QuestTypeEnum";
diff --git a/types/models/eft/common/tables/IRepeatableQuests.d.ts b/types/models/eft/common/tables/IRepeatableQuests.d.ts
index b0a42617..b596c2b7 100644
--- a/types/models/eft/common/tables/IRepeatableQuests.d.ts
+++ b/types/models/eft/common/tables/IRepeatableQuests.d.ts
@@ -1,4 +1,4 @@
-import type { IQuest, IQuestConditionTypes, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
+import { IQuest, IQuestConditionTypes, IQuestRewards } from "@spt/models/eft/common/tables/IQuest";
 export interface IRepeatableQuest extends IQuest {
     changeCost: IChangeCost[];
     changeStandingCost: number;
diff --git a/types/models/eft/common/tables/ITemplateItem.d.ts b/types/models/eft/common/tables/ITemplateItem.d.ts
index dfdffdf3..224eea96 100644
--- a/types/models/eft/common/tables/ITemplateItem.d.ts
+++ b/types/models/eft/common/tables/ITemplateItem.d.ts
@@ -1,4 +1,4 @@
-import type { Ixyz } from "@spt/models/eft/common/Ixyz";
+import { Ixyz } from "@spt/models/eft/common/Ixyz";
 export interface ITemplateItem {
     _id: string;
     _name: string;
diff --git a/types/models/eft/common/tables/ITrader.d.ts b/types/models/eft/common/tables/ITrader.d.ts
index 63b576ed..26eef5d6 100644
--- a/types/models/eft/common/tables/ITrader.d.ts
+++ b/types/models/eft/common/tables/ITrader.d.ts
@@ -1,6 +1,6 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide";
-import type { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel";
+import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel";
 export interface ITrader {
     assort?: ITraderAssort;
     base: ITraderBase;
diff --git a/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts b/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts
index 19279d98..845d92cf 100644
--- a/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts
+++ b/types/models/eft/dialog/IGetAllAttachmentsResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IMessage } from "@spt/models/eft/profile/ISptProfile";
+import { IMessage } from "@spt/models/eft/profile/ISptProfile";
 export interface IGetAllAttachmentsResponse {
     messages: IMessage[];
     profiles: any[];
diff --git a/types/models/eft/dialog/IGetFriendListDataResponse.d.ts b/types/models/eft/dialog/IGetFriendListDataResponse.d.ts
index 6430b648..bb25f90e 100644
--- a/types/models/eft/dialog/IGetFriendListDataResponse.d.ts
+++ b/types/models/eft/dialog/IGetFriendListDataResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IUserDialogInfo } from "../profile/IUserDialogInfo";
 export interface IGetFriendListDataResponse {
     Friends: IUserDialogInfo[];
     Ignore: string[];
diff --git a/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts b/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts
index a09c9077..71a2597f 100644
--- a/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts
+++ b/types/models/eft/dialog/IGetMailDialogViewResponseData.d.ts
@@ -1,4 +1,5 @@
-import type { IMessage, IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IMessage } from "@spt/models/eft/profile/ISptProfile";
+import { IUserDialogInfo } from "../profile/IUserDialogInfo";
 export interface IGetMailDialogViewResponseData {
     messages: IMessage[];
     profiles: IUserDialogInfo[];
diff --git a/types/models/eft/health/IOffraidEatRequestData.d.ts b/types/models/eft/health/IOffraidEatRequestData.d.ts
index 38f325e5..c969b08c 100644
--- a/types/models/eft/health/IOffraidEatRequestData.d.ts
+++ b/types/models/eft/health/IOffraidEatRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
+import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
 export interface IOffraidEatRequestData extends IBaseInteractionRequestData {
     Action: "Eat";
     item: string;
diff --git a/types/models/eft/health/IOffraidHealRequestData.d.ts b/types/models/eft/health/IOffraidHealRequestData.d.ts
index ff28f4f6..c2fe7ba0 100644
--- a/types/models/eft/health/IOffraidHealRequestData.d.ts
+++ b/types/models/eft/health/IOffraidHealRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
+import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
 export interface IOffraidHealRequestData extends IBaseInteractionRequestData {
     Action: "Heal";
     item: string;
diff --git a/types/models/eft/hideout/IHideoutArea.d.ts b/types/models/eft/hideout/IHideoutArea.d.ts
index e794fe7e..d0d9a68e 100644
--- a/types/models/eft/hideout/IHideoutArea.d.ts
+++ b/types/models/eft/hideout/IHideoutArea.d.ts
@@ -1,4 +1,4 @@
-import type { IRequirementBase } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IRequirementBase } from "@spt/models/eft/hideout/IHideoutProduction";
 import { BonusSkillType } from "@spt/models/enums/BonusSkillType";
 import { BonusType } from "@spt/models/enums/BonusType";
 export interface IHideoutArea {
diff --git a/types/models/eft/inRaid/IItemDeliveryRequestData.d.ts b/types/models/eft/inRaid/IItemDeliveryRequestData.d.ts
index e187e17f..7e0fe983 100644
--- a/types/models/eft/inRaid/IItemDeliveryRequestData.d.ts
+++ b/types/models/eft/inRaid/IItemDeliveryRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IItemDeliveryRequestData {
     items: IItem[];
     traderId: string;
diff --git a/types/models/eft/inRaid/IScavSaveRequestData.d.ts b/types/models/eft/inRaid/IScavSaveRequestData.d.ts
index 5778fcf8..3f26e263 100644
--- a/types/models/eft/inRaid/IScavSaveRequestData.d.ts
+++ b/types/models/eft/inRaid/IScavSaveRequestData.d.ts
@@ -1,3 +1,3 @@
-import type { IPostRaidPmcData } from "@spt/models/eft/common/IPmcData";
+import { IPostRaidPmcData } from "@spt/models/eft/common/IPmcData";
 export interface IScavSaveRequestData extends IPostRaidPmcData {
 }
diff --git a/types/models/eft/insurance/IInsureRequestData.d.ts b/types/models/eft/insurance/IInsureRequestData.d.ts
index d4e7f76f..e3b018ef 100644
--- a/types/models/eft/insurance/IInsureRequestData.d.ts
+++ b/types/models/eft/insurance/IInsureRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
+import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
 export interface IInsureRequestData extends IBaseInteractionRequestData {
     Action: "Insure";
     tid: string;
diff --git a/types/models/eft/inventory/IAddItemDirectRequest.d.ts b/types/models/eft/inventory/IAddItemDirectRequest.d.ts
index f829ea23..7f58d002 100644
--- a/types/models/eft/inventory/IAddItemDirectRequest.d.ts
+++ b/types/models/eft/inventory/IAddItemDirectRequest.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IAddItemDirectRequest {
     /** Item and child mods to add to player inventory */
     itemWithModsToAdd: IItem[];
diff --git a/types/models/eft/inventory/IAddItemTempObject.d.ts b/types/models/eft/inventory/IAddItemTempObject.d.ts
index 51316f3a..a822d56a 100644
--- a/types/models/eft/inventory/IAddItemTempObject.d.ts
+++ b/types/models/eft/inventory/IAddItemTempObject.d.ts
@@ -1,4 +1,4 @@
-import type { IItem, IItemLocation } from "@spt/models/eft/common/tables/IItem";
+import { IItem, IItemLocation } from "@spt/models/eft/common/tables/IItem";
 export interface IAddItemTempObject {
     itemRef: IItem;
     count: number;
diff --git a/types/models/eft/inventory/IAddItemsDirectRequest.d.ts b/types/models/eft/inventory/IAddItemsDirectRequest.d.ts
index aab5928a..a7444872 100644
--- a/types/models/eft/inventory/IAddItemsDirectRequest.d.ts
+++ b/types/models/eft/inventory/IAddItemsDirectRequest.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IAddItemsDirectRequest {
     /** Item and child mods to add to player inventory */
     itemsWithModsToAdd: IItem[][];
diff --git a/types/models/eft/inventory/IInventoryAddRequestData.d.ts b/types/models/eft/inventory/IInventoryAddRequestData.d.ts
index 2d0ba4e2..e1ac7ece 100644
--- a/types/models/eft/inventory/IInventoryAddRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryAddRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IContainer, IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IContainer, IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryAddRequestData extends IInventoryBaseActionRequestData {
     Action: "Add";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts b/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts
index b353241d..64b1a3ed 100644
--- a/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryBaseActionRequestData.d.ts
@@ -1,5 +1,5 @@
-import type { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
-import type { IItemLocation } from "@spt/models/eft/common/tables/IItem";
+import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
+import { IItemLocation } from "@spt/models/eft/common/tables/IItem";
 export interface IInventoryBaseActionRequestData extends IBaseInteractionRequestData {
 }
 export interface ITo {
diff --git a/types/models/eft/inventory/IInventoryBindRequestData.d.ts b/types/models/eft/inventory/IInventoryBindRequestData.d.ts
index ec860dc0..5af9fea2 100644
--- a/types/models/eft/inventory/IInventoryBindRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryBindRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryBindRequestData extends IInventoryBaseActionRequestData {
     Action: "Bind";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts b/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts
index fb7bc602..11d6ebde 100644
--- a/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryCreateMarkerRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryCreateMarkerRequestData extends IInventoryBaseActionRequestData {
     Action: "CreateMapMarker";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts b/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts
index 32ece71f..e946f9f1 100644
--- a/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryDeleteMarkerRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryDeleteMarkerRequestData extends IInventoryBaseActionRequestData {
     Action: "DeleteMapMarker";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts b/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts
index 988aabf1..9d7c6754 100644
--- a/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryEditMarkerRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryEditMarkerRequestData extends IInventoryBaseActionRequestData {
     Action: "EditMapMarker";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryExamineRequestData.d.ts b/types/models/eft/inventory/IInventoryExamineRequestData.d.ts
index 5105e33a..58275baa 100644
--- a/types/models/eft/inventory/IInventoryExamineRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryExamineRequestData.d.ts
@@ -1,5 +1,5 @@
 import { OwnerInfo } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryExamineRequestData extends IInventoryBaseActionRequestData {
     Action: "Examine";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryFoldRequestData.d.ts b/types/models/eft/inventory/IInventoryFoldRequestData.d.ts
index 7b3e7b42..79377434 100644
--- a/types/models/eft/inventory/IInventoryFoldRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryFoldRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryFoldRequestData extends IInventoryBaseActionRequestData {
     Action: "Fold";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryMergeRequestData.d.ts b/types/models/eft/inventory/IInventoryMergeRequestData.d.ts
index 692a52f0..ad924baa 100644
--- a/types/models/eft/inventory/IInventoryMergeRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryMergeRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryMergeRequestData extends IInventoryBaseActionRequestData {
     Action: "Merge";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryMoveRequestData.d.ts b/types/models/eft/inventory/IInventoryMoveRequestData.d.ts
index 91912486..e5c2a8b9 100644
--- a/types/models/eft/inventory/IInventoryMoveRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryMoveRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData, ITo } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData, ITo } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryMoveRequestData extends IInventoryBaseActionRequestData {
     Action: "Move";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts b/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts
index 2ed0e1a2..ce613702 100644
--- a/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryReadEncyclopediaRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryReadEncyclopediaRequestData extends IInventoryBaseActionRequestData {
     Action: "ReadEncyclopedia";
     ids: string[];
diff --git a/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts b/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts
index cb309ca6..b9fa232d 100644
--- a/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryRemoveRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryRemoveRequestData extends IInventoryBaseActionRequestData {
     Action: "Remove";
     item: string;
diff --git a/types/models/eft/inventory/IInventorySortRequestData.d.ts b/types/models/eft/inventory/IInventorySortRequestData.d.ts
index 3bfba21b..10ee2715 100644
--- a/types/models/eft/inventory/IInventorySortRequestData.d.ts
+++ b/types/models/eft/inventory/IInventorySortRequestData.d.ts
@@ -1,5 +1,5 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventorySortRequestData extends IInventoryBaseActionRequestData {
     Action: "ApplyInventoryChanges";
     changedItems: IItem[];
diff --git a/types/models/eft/inventory/IInventorySplitRequestData.d.ts b/types/models/eft/inventory/IInventorySplitRequestData.d.ts
index a1088645..5667f0a9 100644
--- a/types/models/eft/inventory/IInventorySplitRequestData.d.ts
+++ b/types/models/eft/inventory/IInventorySplitRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IContainer, IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IContainer, IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventorySplitRequestData extends IInventoryBaseActionRequestData {
     Action: "Split";
     /** Id of item to split */
diff --git a/types/models/eft/inventory/IInventorySwapRequestData.d.ts b/types/models/eft/inventory/IInventorySwapRequestData.d.ts
index bbb9f7b0..abd3adb0 100644
--- a/types/models/eft/inventory/IInventorySwapRequestData.d.ts
+++ b/types/models/eft/inventory/IInventorySwapRequestData.d.ts
@@ -1,5 +1,5 @@
 import { OwnerInfo } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
-import type { IInventoryBaseActionRequestData, ITo } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData, ITo } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventorySwapRequestData extends IInventoryBaseActionRequestData {
     Action: "Swap";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryTagRequestData.d.ts b/types/models/eft/inventory/IInventoryTagRequestData.d.ts
index a87e5563..5c9f6514 100644
--- a/types/models/eft/inventory/IInventoryTagRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryTagRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryTagRequestData extends IInventoryBaseActionRequestData {
     Action: "Tag";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryToggleRequestData.d.ts b/types/models/eft/inventory/IInventoryToggleRequestData.d.ts
index 935066b9..0d8b1e45 100644
--- a/types/models/eft/inventory/IInventoryToggleRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryToggleRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryToggleRequestData extends IInventoryBaseActionRequestData {
     Action: "Toggle";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryTransferRequestData.d.ts b/types/models/eft/inventory/IInventoryTransferRequestData.d.ts
index c4fcc50d..fe0327d2 100644
--- a/types/models/eft/inventory/IInventoryTransferRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryTransferRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryTransferRequestData extends IInventoryBaseActionRequestData {
     Action: "Transfer";
     item: string;
diff --git a/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts b/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts
index c1906124..d3a4bd73 100644
--- a/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts
+++ b/types/models/eft/inventory/IInventoryUnbindRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IInventoryUnbindRequestData extends IInventoryBaseActionRequestData {
     Action: "Unbind";
     item: string;
diff --git a/types/models/eft/inventory/IOpenRandomLootContainerRequestData.d.ts b/types/models/eft/inventory/IOpenRandomLootContainerRequestData.d.ts
index bceba996..f9bc284b 100644
--- a/types/models/eft/inventory/IOpenRandomLootContainerRequestData.d.ts
+++ b/types/models/eft/inventory/IOpenRandomLootContainerRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IOpenRandomLootContainerRequestData extends IInventoryBaseActionRequestData {
     Action: "OpenRandomLootContainer";
     /** Container item id being opened */
diff --git a/types/models/eft/inventory/IRedeemProfileRequestData.d.ts b/types/models/eft/inventory/IRedeemProfileRequestData.d.ts
index c238baea..d39c9e69 100644
--- a/types/models/eft/inventory/IRedeemProfileRequestData.d.ts
+++ b/types/models/eft/inventory/IRedeemProfileRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface IRedeemProfileRequestData extends IInventoryBaseActionRequestData {
     Action: "RedeemProfileReward";
     events: IRedeemProfileRequestEvent[];
diff --git a/types/models/eft/inventory/ISetFavoriteItems.d.ts b/types/models/eft/inventory/ISetFavoriteItems.d.ts
index 6e607ca0..24aac374 100644
--- a/types/models/eft/inventory/ISetFavoriteItems.d.ts
+++ b/types/models/eft/inventory/ISetFavoriteItems.d.ts
@@ -1,4 +1,4 @@
-import type { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
+import { IInventoryBaseActionRequestData } from "@spt/models/eft/inventory/IInventoryBaseActionRequestData";
 export interface ISetFavoriteItems extends IInventoryBaseActionRequestData {
     Action: "SetFavoriteItems";
     items: any[];
diff --git a/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts b/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts
index 2852934c..f9165dc8 100644
--- a/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts
+++ b/types/models/eft/itemEvent/IEmptyItemEventRouterResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IItemEventRouterBase } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
+import { IItemEventRouterBase } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
 export interface IEmptyItemEventRouterResponse extends IItemEventRouterBase {
     profileChanges: "";
 }
diff --git a/types/models/eft/itemEvent/IItemEventRouterBase.d.ts b/types/models/eft/itemEvent/IItemEventRouterBase.d.ts
index b8f96936..b66fc03b 100644
--- a/types/models/eft/itemEvent/IItemEventRouterBase.d.ts
+++ b/types/models/eft/itemEvent/IItemEventRouterBase.d.ts
@@ -1,8 +1,8 @@
 import { IHealth, IHideoutImprovement, IMoneyTransferLimits, IProductive, IQuestStatus, ISkills } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem, IItemLocation, IUpd } from "@spt/models/eft/common/tables/IItem";
-import type { IQuest } from "@spt/models/eft/common/tables/IQuest";
-import type { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IItem, IItemLocation, IUpd } from "@spt/models/eft/common/tables/IItem";
+import { IQuest } from "@spt/models/eft/common/tables/IQuest";
+import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 import { EquipmentBuildType } from "@spt/models/enums/EquipmentBuildType";
 export interface IItemEventRouterBase {
     warnings: Warning[];
diff --git a/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts b/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts
index ca961f25..d4913bed 100644
--- a/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts
+++ b/types/models/eft/itemEvent/IItemEventRouterResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IItemEventRouterBase } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
+import { IItemEventRouterBase } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
 /** An object sent back to the game client that contains alterations the client must make to ensure server/client are in sync */
 export interface IItemEventRouterResponse extends IItemEventRouterBase {
 }
diff --git a/types/models/eft/launcher/IChangeRequestData.d.ts b/types/models/eft/launcher/IChangeRequestData.d.ts
index 034764ec..b0431d7d 100644
--- a/types/models/eft/launcher/IChangeRequestData.d.ts
+++ b/types/models/eft/launcher/IChangeRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
 export interface IChangeRequestData extends ILoginRequestData {
     change: string;
 }
diff --git a/types/models/eft/launcher/IMiniProfile.d.ts b/types/models/eft/launcher/IMiniProfile.d.ts
index 151405ab..856920f1 100644
--- a/types/models/eft/launcher/IMiniProfile.d.ts
+++ b/types/models/eft/launcher/IMiniProfile.d.ts
@@ -1,4 +1,4 @@
-import type { ISpt } from "../profile/ISptProfile";
+import { ISpt } from "../profile/ISptProfile";
 export interface IMiniProfile {
     username: string;
     nickname: string;
diff --git a/types/models/eft/launcher/IRegisterData.d.ts b/types/models/eft/launcher/IRegisterData.d.ts
index 06e67abe..4a3c15e6 100644
--- a/types/models/eft/launcher/IRegisterData.d.ts
+++ b/types/models/eft/launcher/IRegisterData.d.ts
@@ -1,4 +1,4 @@
-import type { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
 export interface IRegisterData extends ILoginRequestData {
     edition: string;
 }
diff --git a/types/models/eft/launcher/IRemoveProfileData.d.ts b/types/models/eft/launcher/IRemoveProfileData.d.ts
index 81c76913..59848edb 100644
--- a/types/models/eft/launcher/IRemoveProfileData.d.ts
+++ b/types/models/eft/launcher/IRemoveProfileData.d.ts
@@ -1,2 +1,2 @@
-import type { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
 export type IRemoveProfileData = ILoginRequestData;
diff --git a/types/models/eft/location/IAirdropLootResult.d.ts b/types/models/eft/location/IAirdropLootResult.d.ts
index bcff7923..963e43cc 100644
--- a/types/models/eft/location/IAirdropLootResult.d.ts
+++ b/types/models/eft/location/IAirdropLootResult.d.ts
@@ -1,4 +1,4 @@
-import type { ILootItem } from "@spt/models/spt/services/LootItem";
+import { ILootItem } from "@spt/models/spt/services/LootItem";
 export interface IAirdropLootResult {
     dropType: string;
     loot: ILootItem[];
diff --git a/types/models/eft/location/IGetAirdropLootResponse.d.ts b/types/models/eft/location/IGetAirdropLootResponse.d.ts
index d54831b1..93950db1 100644
--- a/types/models/eft/location/IGetAirdropLootResponse.d.ts
+++ b/types/models/eft/location/IGetAirdropLootResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { AirdropTypeEnum } from "@spt/models/enums/AirdropType";
 export interface IGetAirdropLootResponse {
     icon: AirdropTypeEnum;
diff --git a/types/models/eft/match/IEndLocalRaidRequestData.d.ts b/types/models/eft/match/IEndLocalRaidRequestData.d.ts
index a81557fb..53b41259 100644
--- a/types/models/eft/match/IEndLocalRaidRequestData.d.ts
+++ b/types/models/eft/match/IEndLocalRaidRequestData.d.ts
@@ -1,6 +1,6 @@
 import { ExitStatus } from "@spt/models/enums/ExitStatis";
-import type { IPmcData } from "../common/IPmcData";
-import type { IItem } from "../common/tables/IItem";
+import { IPmcData } from "../common/IPmcData";
+import { IItem } from "../common/tables/IItem";
 export interface IEndLocalRaidRequestData {
     /** ID of server player just left */
     serverId: string;
diff --git a/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts b/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts
index 7a214938..ad65e88f 100644
--- a/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts
+++ b/types/models/eft/match/IGetRaidConfigurationRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IRaidSettings } from "@spt/models/eft/match/IRaidSettings";
+import { IRaidSettings } from "@spt/models/eft/match/IRaidSettings";
 export interface IGetRaidConfigurationRequestData extends IRaidSettings {
     keyId: string;
     MaxGroupCount: number;
diff --git a/types/models/eft/match/IGroupCharacter.d.ts b/types/models/eft/match/IGroupCharacter.d.ts
index 2318f27a..dbb8c876 100644
--- a/types/models/eft/match/IGroupCharacter.d.ts
+++ b/types/models/eft/match/IGroupCharacter.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { MemberCategory } from "@spt/models/enums/MemberCategory";
 export interface IGroupCharacter {
     _id: string;
diff --git a/types/models/eft/match/IMatchGroupCurrentResponse.d.ts b/types/models/eft/match/IMatchGroupCurrentResponse.d.ts
index 786967c9..23bcba49 100644
--- a/types/models/eft/match/IMatchGroupCurrentResponse.d.ts
+++ b/types/models/eft/match/IMatchGroupCurrentResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
 export interface IMatchGroupCurrentResponse {
     squad: IGroupCharacter[];
 }
diff --git a/types/models/eft/match/IMatchGroupStartGameRequest.d.ts b/types/models/eft/match/IMatchGroupStartGameRequest.d.ts
index e3e88853..663ef1ed 100644
--- a/types/models/eft/match/IMatchGroupStartGameRequest.d.ts
+++ b/types/models/eft/match/IMatchGroupStartGameRequest.d.ts
@@ -1,4 +1,4 @@
-import type { IServer } from "@spt/models/eft/match/IServer";
+import { IServer } from "@spt/models/eft/match/IServer";
 export interface IMatchGroupStartGameRequest {
     groupId: string;
     servers: IServer[];
diff --git a/types/models/eft/match/IMatchGroupStatusResponse.d.ts b/types/models/eft/match/IMatchGroupStatusResponse.d.ts
index 20800499..7702ac70 100644
--- a/types/models/eft/match/IMatchGroupStatusResponse.d.ts
+++ b/types/models/eft/match/IMatchGroupStatusResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
 export interface IMatchGroupStatusResponse {
     players: IGroupCharacter[];
     maxPveCountExceeded: boolean;
diff --git a/types/models/eft/match/IProfileStatusResponse.d.ts b/types/models/eft/match/IProfileStatusResponse.d.ts
index 62cdd1cb..8fa61860 100644
--- a/types/models/eft/match/IProfileStatusResponse.d.ts
+++ b/types/models/eft/match/IProfileStatusResponse.d.ts
@@ -1,4 +1,4 @@
-import type { ISessionStatus } from "@spt/models/eft/match/ISessionStatus";
+import { ISessionStatus } from "@spt/models/eft/match/ISessionStatus";
 export interface IProfileStatusResponse {
     maxPveCountExceeded: boolean;
     profiles: ISessionStatus[];
diff --git a/types/models/eft/match/IStartLocalRaidResponseData.d.ts b/types/models/eft/match/IStartLocalRaidResponseData.d.ts
index 8724fb10..2cf0111e 100644
--- a/types/models/eft/match/IStartLocalRaidResponseData.d.ts
+++ b/types/models/eft/match/IStartLocalRaidResponseData.d.ts
@@ -1,7 +1,7 @@
-import type { ILocationBase } from "@spt/models/eft/common/ILocationBase";
-import type { IInsuredItem } from "@spt/models/eft/common/tables/IBotBase";
-import type { ILocationServices } from "@spt/models/eft/common/tables/ILocationServices";
-import type { TransitionType } from "@spt/models/enums/TransitionType";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { IInsuredItem } from "@spt/models/eft/common/tables/IBotBase";
+import { ILocationServices } from "@spt/models/eft/common/tables/ILocationServices";
+import { TransitionType } from "@spt/models/enums/TransitionType";
 export interface IStartLocalRaidResponseData {
     serverId: string;
     serverSettings: ILocationServices;
diff --git a/types/models/eft/notes/INoteActionData.d.ts b/types/models/eft/notes/INoteActionData.d.ts
index 8b91dc4a..344c40da 100644
--- a/types/models/eft/notes/INoteActionData.d.ts
+++ b/types/models/eft/notes/INoteActionData.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
+import { IBaseInteractionRequestData } from "@spt/models/eft/common/request/IBaseInteractionRequestData";
 export interface INoteActionData extends IBaseInteractionRequestData {
     Action: string;
     index: number;
diff --git a/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts
index a9761dbf..b59fe107 100644
--- a/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts
+++ b/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { ISkills } from "@spt/models/eft/common/tables/IBotBase";
+import { ISkills } from "@spt/models/eft/common/tables/IBotBase";
 export interface IPlayerIncrementSkillLevelRequestData {
     _id: string;
     experience: number;
diff --git a/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts b/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts
index cda9fe54..9852ccbc 100644
--- a/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts
+++ b/types/models/eft/presetBuild/IPresetBuildActionRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IPresetBuildActionRequestData {
     Action: string;
     Id: string;
diff --git a/types/models/eft/prestige/IGetPrestigeResponse.d.ts b/types/models/eft/prestige/IGetPrestigeResponse.d.ts
new file mode 100644
index 00000000..2d98fdef
--- /dev/null
+++ b/types/models/eft/prestige/IGetPrestigeResponse.d.ts
@@ -0,0 +1,4 @@
+import { IPrestige } from "@spt/models/eft/common/tables/IPrestige";
+export interface IGetPrestigeResponse {
+    elements: IPrestige;
+}
diff --git a/types/models/eft/profile/IGetAchievementsResponse.d.ts b/types/models/eft/profile/IGetAchievementsResponse.d.ts
index 80d483d5..6963fcf9 100644
--- a/types/models/eft/profile/IGetAchievementsResponse.d.ts
+++ b/types/models/eft/profile/IGetAchievementsResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IAchievement } from "@spt/models/eft/common/tables/IAchievement";
+import { IAchievement } from "@spt/models/eft/common/tables/IAchievement";
 export interface IGetAchievementsResponse {
     elements: IAchievement[];
 }
diff --git a/types/models/eft/profile/IGetOtherProfileResponse.d.ts b/types/models/eft/profile/IGetOtherProfileResponse.d.ts
index 4679732e..311c9f75 100644
--- a/types/models/eft/profile/IGetOtherProfileResponse.d.ts
+++ b/types/models/eft/profile/IGetOtherProfileResponse.d.ts
@@ -1,5 +1,5 @@
-import type { IOverallCounters, ISkills } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IOverallCounters, ISkills } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IGetOtherProfileResponse {
     id: string;
     aid: number;
diff --git a/types/models/eft/profile/IMessageContentRagfair.d.ts b/types/models/eft/profile/IMessageContentRagfair.d.ts
new file mode 100644
index 00000000..dca36f7f
--- /dev/null
+++ b/types/models/eft/profile/IMessageContentRagfair.d.ts
@@ -0,0 +1,5 @@
+export interface IMessageContentRagfair {
+    offerId: string;
+    count: number;
+    handbookId: string;
+}
diff --git a/types/models/eft/profile/ISptProfile.d.ts b/types/models/eft/profile/ISptProfile.d.ts
index 9d504da7..7bd2e51f 100644
--- a/types/models/eft/profile/ISptProfile.d.ts
+++ b/types/models/eft/profile/ISptProfile.d.ts
@@ -1,9 +1,11 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { EquipmentBuildType } from "@spt/models/enums/EquipmentBuildType";
 import { MemberCategory } from "@spt/models/enums/MemberCategory";
 import { MessageType } from "@spt/models/enums/MessageType";
-import type { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails";
+import { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails";
+import { ISystemData } from "./ISystemData";
+import { IUserDialogInfo } from "./IUserDialogInfo";
 export interface ISptProfile {
     info: Info;
     characters: ICharacters;
@@ -85,18 +87,6 @@ export interface IDialogue {
     messages: IMessage[];
     _id: string;
 }
-export interface IUserDialogInfo {
-    _id: string;
-    aid: number;
-    Info?: IUserDialogDetails;
-}
-export interface IUserDialogDetails {
-    Nickname: string;
-    Side: string;
-    Level: number;
-    MemberCategory: MemberCategory;
-    SelectedMemberCategory: MemberCategory;
-}
 export interface IDialogueInfo {
     attachmentsNew: number;
     new: number;
@@ -142,14 +132,6 @@ export interface IMessageItems {
     stash?: string;
     data?: IItem[];
 }
-export interface ISystemData {
-    date?: string;
-    time?: string;
-    location?: string;
-    buyerNickname?: string;
-    soldItem?: string;
-    itemCount?: number;
-}
 export interface IUpdatableChatMember {
     Nickname: string;
     Side: string;
@@ -244,8 +226,3 @@ export interface IInsurance {
     messageTemplateId: string;
     items: IItem[];
 }
-export interface IMessageContentRagfair {
-    offerId: string;
-    count: number;
-    handbookId: string;
-}
diff --git a/types/models/eft/profile/ISystemData.d.ts b/types/models/eft/profile/ISystemData.d.ts
new file mode 100644
index 00000000..d8fc46e9
--- /dev/null
+++ b/types/models/eft/profile/ISystemData.d.ts
@@ -0,0 +1,8 @@
+export interface ISystemData {
+    date?: string;
+    time?: string;
+    location?: string;
+    buyerNickname?: string;
+    soldItem?: string;
+    itemCount?: number;
+}
diff --git a/types/models/eft/profile/IUserDialogInfo.d.ts b/types/models/eft/profile/IUserDialogInfo.d.ts
new file mode 100644
index 00000000..3ac5e6ed
--- /dev/null
+++ b/types/models/eft/profile/IUserDialogInfo.d.ts
@@ -0,0 +1,13 @@
+import { MemberCategory } from "@spt/models/enums/MemberCategory";
+export interface IUserDialogInfo {
+    _id: string;
+    aid: number;
+    Info?: IUserDialogDetails;
+}
+export interface IUserDialogDetails {
+    Nickname: string;
+    Side: string;
+    Level: number;
+    MemberCategory: MemberCategory;
+    SelectedMemberCategory: MemberCategory;
+}
diff --git a/types/models/eft/ragfair/IGetOffersResult.d.ts b/types/models/eft/ragfair/IGetOffersResult.d.ts
index a1be1e19..f3420fa5 100644
--- a/types/models/eft/ragfair/IGetOffersResult.d.ts
+++ b/types/models/eft/ragfair/IGetOffersResult.d.ts
@@ -1,4 +1,4 @@
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 export interface IGetOffersResult {
     categories?: Record<string, number>;
     offers: IRagfairOffer[];
diff --git a/types/models/eft/ragfair/IRagfairOffer.d.ts b/types/models/eft/ragfair/IRagfairOffer.d.ts
index 26f5c97c..77c56056 100644
--- a/types/models/eft/ragfair/IRagfairOffer.d.ts
+++ b/types/models/eft/ragfair/IRagfairOffer.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide";
 import { MemberCategory } from "@spt/models/enums/MemberCategory";
 export interface IRagfairOffer {
diff --git a/types/models/eft/repair/IRepairActionDataRequest.d.ts b/types/models/eft/repair/IRepairActionDataRequest.d.ts
index 21324f1e..58773dff 100644
--- a/types/models/eft/repair/IRepairActionDataRequest.d.ts
+++ b/types/models/eft/repair/IRepairActionDataRequest.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseRepairActionDataRequest } from "@spt/models/eft/repair/IBaseRepairActionDataRequest";
+import { IBaseRepairActionDataRequest } from "@spt/models/eft/repair/IBaseRepairActionDataRequest";
 export interface IRepairActionDataRequest extends IBaseRepairActionDataRequest {
     Action: "Repair";
     repairKitsInfo: IRepairKitsInfo[];
diff --git a/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts b/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts
index 1f263d28..c55a1d92 100644
--- a/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts
+++ b/types/models/eft/repair/ITraderRepairActionDataRequest.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseRepairActionDataRequest } from "@spt/models/eft/repair/IBaseRepairActionDataRequest";
+import { IBaseRepairActionDataRequest } from "@spt/models/eft/repair/IBaseRepairActionDataRequest";
 export interface ITraderRepairActionDataRequest extends IBaseRepairActionDataRequest {
     Action: "TraderRepair";
     tid: string;
diff --git a/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts b/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts
index 396a3380..d72a1316 100644
--- a/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts
+++ b/types/models/eft/trade/IProcessBuyTradeRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
 export interface IProcessBuyTradeRequestData extends IProcessBaseTradeRequestData {
     Action: "buy_from_trader" | "TradingConfirm" | "RestoreHealth" | "SptInsure" | "SptRepair" | "";
     type: string;
diff --git a/types/models/eft/trade/IProcessSellTradeRequestData.d.ts b/types/models/eft/trade/IProcessSellTradeRequestData.d.ts
index f53aaa90..b345c3e4 100644
--- a/types/models/eft/trade/IProcessSellTradeRequestData.d.ts
+++ b/types/models/eft/trade/IProcessSellTradeRequestData.d.ts
@@ -1,4 +1,4 @@
-import type { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
 export interface IProcessSellTradeRequestData extends IProcessBaseTradeRequestData {
     Action: "sell_to_trader";
     type: string;
diff --git a/types/models/eft/ws/IWsAid.d.ts b/types/models/eft/ws/IWsAid.d.ts
index 4ed75c12..310d507f 100644
--- a/types/models/eft/ws/IWsAid.d.ts
+++ b/types/models/eft/ws/IWsAid.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsAid extends IWsNotificationEvent {
     aid: number;
 }
diff --git a/types/models/eft/ws/IWsAidNickname.d.ts b/types/models/eft/ws/IWsAidNickname.d.ts
index 00f72a55..e623b19c 100644
--- a/types/models/eft/ws/IWsAidNickname.d.ts
+++ b/types/models/eft/ws/IWsAidNickname.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsAidNickname extends IWsNotificationEvent {
     aid: number;
     Nickname: string;
diff --git a/types/models/eft/ws/IWsChatMessageReceived.d.ts b/types/models/eft/ws/IWsChatMessageReceived.d.ts
index 20a5ff92..cc73cf3c 100644
--- a/types/models/eft/ws/IWsChatMessageReceived.d.ts
+++ b/types/models/eft/ws/IWsChatMessageReceived.d.ts
@@ -1,6 +1,6 @@
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
-import type { IMessage } from "@spt/models/eft/profile/ISptProfile";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IMessage } from "@spt/models/eft/profile/ISptProfile";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsChatMessageReceived extends IWsNotificationEvent {
     dialogId: string;
     message: IMessage;
diff --git a/types/models/eft/ws/IWsFriendsListAccept.d.ts b/types/models/eft/ws/IWsFriendsListAccept.d.ts
index 41a47ef6..4a96db3c 100644
--- a/types/models/eft/ws/IWsFriendsListAccept.d.ts
+++ b/types/models/eft/ws/IWsFriendsListAccept.d.ts
@@ -1,5 +1,5 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
-import type { ISearchFriendResponse } from "../profile/ISearchFriendResponse";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { ISearchFriendResponse } from "../profile/ISearchFriendResponse";
 export interface IWsFriendsListAccept extends IWsNotificationEvent {
     profile: ISearchFriendResponse;
 }
diff --git a/types/models/eft/ws/IWsGroupId.d.ts b/types/models/eft/ws/IWsGroupId.d.ts
index 42f7c765..62a8c6f9 100644
--- a/types/models/eft/ws/IWsGroupId.d.ts
+++ b/types/models/eft/ws/IWsGroupId.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupId extends IWsNotificationEvent {
     groupId: string;
 }
diff --git a/types/models/eft/ws/IWsGroupMatchInviteAccept.d.ts b/types/models/eft/ws/IWsGroupMatchInviteAccept.d.ts
index 63045084..8f100acb 100644
--- a/types/models/eft/ws/IWsGroupMatchInviteAccept.d.ts
+++ b/types/models/eft/ws/IWsGroupMatchInviteAccept.d.ts
@@ -1,4 +1,4 @@
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupMatchInviteAccept extends IWsNotificationEvent, IGroupCharacter {
 }
diff --git a/types/models/eft/ws/IWsGroupMatchInviteDecline.d.ts b/types/models/eft/ws/IWsGroupMatchInviteDecline.d.ts
index c949fde7..cf154092 100644
--- a/types/models/eft/ws/IWsGroupMatchInviteDecline.d.ts
+++ b/types/models/eft/ws/IWsGroupMatchInviteDecline.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupMatchInviteDecline extends IWsNotificationEvent {
     aid: number;
     Nickname: string;
diff --git a/types/models/eft/ws/IWsGroupMatchInviteSend.d.ts b/types/models/eft/ws/IWsGroupMatchInviteSend.d.ts
index d17fb40d..b52a49c3 100644
--- a/types/models/eft/ws/IWsGroupMatchInviteSend.d.ts
+++ b/types/models/eft/ws/IWsGroupMatchInviteSend.d.ts
@@ -1,5 +1,5 @@
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupMatchInviteSend extends IWsNotificationEvent {
     requestId: string;
     from: number;
diff --git a/types/models/eft/ws/IWsGroupMatchLeaderChanged.d.ts b/types/models/eft/ws/IWsGroupMatchLeaderChanged.d.ts
index 9e4c1bef..a374183e 100644
--- a/types/models/eft/ws/IWsGroupMatchLeaderChanged.d.ts
+++ b/types/models/eft/ws/IWsGroupMatchLeaderChanged.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupMatchLeaderChanged extends IWsNotificationEvent {
     owner: number;
 }
diff --git a/types/models/eft/ws/IWsGroupMatchRaidReady.d.ts b/types/models/eft/ws/IWsGroupMatchRaidReady.d.ts
index 20d3559e..ab769187 100644
--- a/types/models/eft/ws/IWsGroupMatchRaidReady.d.ts
+++ b/types/models/eft/ws/IWsGroupMatchRaidReady.d.ts
@@ -1,5 +1,5 @@
-import type { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IGroupCharacter } from "@spt/models/eft/match/IGroupCharacter";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupMatchRaidReady extends IWsNotificationEvent {
     extendedProfile: IGroupCharacter;
 }
diff --git a/types/models/eft/ws/IWsGroupMatchRaidSettings.d.ts b/types/models/eft/ws/IWsGroupMatchRaidSettings.d.ts
index 18363542..5fa52afd 100644
--- a/types/models/eft/ws/IWsGroupMatchRaidSettings.d.ts
+++ b/types/models/eft/ws/IWsGroupMatchRaidSettings.d.ts
@@ -1,5 +1,5 @@
-import type { IRaidSettings } from "@spt/models/eft/match/IRaidSettings";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IRaidSettings } from "@spt/models/eft/match/IRaidSettings";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsGroupMatchRaidSettings extends IWsNotificationEvent {
     raidSettings: IRaidSettings;
 }
diff --git a/types/models/eft/ws/IWsPing.d.ts b/types/models/eft/ws/IWsPing.d.ts
index d6bdbe9b..d43aa030 100644
--- a/types/models/eft/ws/IWsPing.d.ts
+++ b/types/models/eft/ws/IWsPing.d.ts
@@ -1,3 +1,3 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsPing extends IWsNotificationEvent {
 }
diff --git a/types/models/eft/ws/IWsRagfairOfferSold.d.ts b/types/models/eft/ws/IWsRagfairOfferSold.d.ts
index 4e6b4b0f..1c4c88e5 100644
--- a/types/models/eft/ws/IWsRagfairOfferSold.d.ts
+++ b/types/models/eft/ws/IWsRagfairOfferSold.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export interface IWsRagfairOfferSold extends IWsNotificationEvent {
     offerId: string;
     count: number;
diff --git a/types/models/eft/ws/IWsUserConfirmed.d.ts b/types/models/eft/ws/IWsUserConfirmed.d.ts
index 696bad0a..ac32e0d2 100644
--- a/types/models/eft/ws/IWsUserConfirmed.d.ts
+++ b/types/models/eft/ws/IWsUserConfirmed.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 import { ProfileStatus } from "@spt/models/enums/ProfileStatus";
 import { RaidMode } from "@spt/models/enums/RaidMode";
 export interface IWsUserConfirmed extends IWsNotificationEvent {
diff --git a/types/models/enums/EntryType.d.ts b/types/models/enums/EntryType.d.ts
new file mode 100644
index 00000000..ac053d49
--- /dev/null
+++ b/types/models/enums/EntryType.d.ts
@@ -0,0 +1,7 @@
+export declare enum EntryType {
+    LOCAL = "LOCAL",
+    DEBUG = "DEBUG",
+    RELEASE = "RELEASE",
+    BLEEDING_EDGE = "BLEEDING_EDGE",
+    BLEEDING_EDGE_MODS = "BLEEDING_EDGE_MODS"
+}
diff --git a/types/models/enums/ItemTpl.d.ts b/types/models/enums/ItemTpl.d.ts
index d674d9e3..f7c39f4c 100644
--- a/types/models/enums/ItemTpl.d.ts
+++ b/types/models/enums/ItemTpl.d.ts
@@ -2279,7 +2279,7 @@ export declare enum ItemTpl {
     INFO_TGVI24_LETHAL_VACCINE = "6707d0804e617ec94f0e562f",
     INFO_TGVI24_TRUE_VACCINE = "6707d0bdaab679420007e01a",
     INFO_TOPOGRAPHIC_SURVEY_MAPS = "62a0a124de7ac81993580542",
-    INFO_VIDEO_CASSETTE_WITH_THE_CYBORG_KILLER_MOVIE = "62a09e974f842e1bd12da3f0",
+    INFO_VIDEO_CASSETTE_WITH_THE_MOVIE_CYBORG_KILLER_FROM_PROKHODIMEC = "62a09e974f842e1bd12da3f0",
     INVENTORY_DEFAULT = "55d7217a4bdc2d86028b456d",
     IRONSIGHT_AK105_REAR_SIGHT = "5ac733a45acfc400192630e2",
     IRONSIGHT_AK12_REAR_SIGHT = "649ec2cec93611967b03495e",
@@ -2812,8 +2812,7 @@ export declare enum ItemTpl {
     MAGAZINE_556X45_HK_STEEL_30RND = "5c05413a0db834001c390617",
     MAGAZINE_556X45_MAG5100_100RND = "5c6592372e221600133e47d7",
     MAGAZINE_556X45_MAG560_60RND = "544a37c44bdc2d25388b4567",
-    MAGAZINE_556X45_MK16_30RND = "61840bedd92c473c77021635",
-    MAGAZINE_556X45_MK16_30RND_FDE = "61840d85568c120fdd2962a5",
+    MAGAZINE_556X45_MK16_30RND = "61840d85568c120fdd2962a5",
     MAGAZINE_556X45_PMAG_D60_60RND = "59c1383d86f774290a37e0ca",
     MAGAZINE_556X45_PM_GEN2_30RND = "5c6d450c2e221600114c997d",
     MAGAZINE_556X45_STANAG_30RND = "55d4887d4bdc2d962f8b4570",
@@ -3658,6 +3657,27 @@ export declare enum ItemTpl {
     RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_SUMMER_DROPS_2024_RARE = "6694f418c74d8a180f0f78c0",
     RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_SUMMER_DROPS_2024_RARE_PLUS_1 = "66a3898c1df2a447cc0d3c35",
     RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_SUMMER_DROPS_2024_RARE_PLUS_2 = "66a3898f0982fc7e4c091c4d",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY0 = "676a93c51888885b4e008b18",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY1 = "676a95041888885b4e008b36",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY2 = "676a98d7b4ba2f4afa04c704",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY3 = "676a9a5c744595610f0ed501",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY4 = "676a9b15b4ba2f4afa04c7ad",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY5 = "676a9b1afe1fc45172014d32",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_COMMON_DAY6 = "676a9bc6744595610f0ed52e",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY0 = "676aa104fe1fc45172014da3",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY1 = "676aa29243000db5340061b5",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY2 = "676aa30ffe1fc45172014dce",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY3 = "676aa37ff90b6f429601afb5",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY4 = "676aa3cf7a232aa5c70bda8d",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY5 = "676aa3fc20a7cc6f4309e078",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_EPIC_DAY6 = "676aa450fe1fc45172014df2",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY0 = "676a9da81888885b4e008c51",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY1 = "676a9e46744595610f0ed53f",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY2 = "676a9f03744595610f0ed55f",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY3 = "676a9fc7a65670a58c084c9e",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY4 = "676aa016744595610f0ed563",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY5 = "676aa025fe1fc45172014d9f",
+    RANDOMLOOTCONTAINER_ITEM_CONTAINER_EVENT_TWITCH_WINTER_DROPS_2025_RARE_DAY6 = "676aa0f11888885b4e008c8b",
     RANDOMLOOTCONTAINER_NEW_YEAR_GIFT_BIG = "63a897c6b1ff6e29734fcc95",
     RANDOMLOOTCONTAINER_NEW_YEAR_GIFT_MEDIUM = "63a898a328e385334e0640a5",
     RANDOMLOOTCONTAINER_NEW_YEAR_GIFT_SMALL = "63a8970d7108f713591149f5",
diff --git a/types/models/enums/QuestRewardType.d.ts b/types/models/enums/QuestRewardType.d.ts
index e09f71d3..9d3d6bfd 100644
--- a/types/models/enums/QuestRewardType.d.ts
+++ b/types/models/enums/QuestRewardType.d.ts
@@ -10,5 +10,6 @@ export declare enum QuestRewardType {
     TRADER_STANDING_RESTORE = "TraderStandingRestore",
     STASH_ROWS = "StashRows",
     ACHIEVEMENT = "Achievement",
-    POCKETS = "Pockets"
+    POCKETS = "Pockets",
+    CUSTOMIZATION_DIRECT = "CustomizationDirect"
 }
diff --git a/types/models/external/HttpFramework.d.ts b/types/models/external/HttpFramework.d.ts
index 3e727d33..96fb4ed8 100644
--- a/types/models/external/HttpFramework.d.ts
+++ b/types/models/external/HttpFramework.d.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 export type HandleFn = (_: string, req: IncomingMessage, resp: ServerResponse) => void;
 /**
  *  Associates handlers, HTTP methods and a base url to a listener using a proxy
diff --git a/types/models/spt/bots/IBots.d.ts b/types/models/spt/bots/IBots.d.ts
index 53495f02..f413be4e 100644
--- a/types/models/spt/bots/IBots.d.ts
+++ b/types/models/spt/bots/IBots.d.ts
@@ -1,6 +1,6 @@
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
-import type { IBotType } from "@spt/models/eft/common/tables/IBotType";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
+import { IBotType } from "@spt/models/eft/common/tables/IBotType";
 export interface IBots {
     types: Record<string, IBotType>;
     base: IBotBase;
diff --git a/types/models/spt/bots/IGenerateEquipmentProperties.d.ts b/types/models/spt/bots/IGenerateEquipmentProperties.d.ts
index 3e4a8720..e19a9e07 100644
--- a/types/models/spt/bots/IGenerateEquipmentProperties.d.ts
+++ b/types/models/spt/bots/IGenerateEquipmentProperties.d.ts
@@ -1,7 +1,7 @@
-import type { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IChances, IMods } from "@spt/models/eft/common/tables/IBotType";
+import { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IChances, IMods } from "@spt/models/eft/common/tables/IBotType";
 import { EquipmentFilters, IRandomisationDetails } from "@spt/models/spt/config/IBotConfig";
-import type { IBotData } from "./IGenerateWeaponRequest";
+import { IBotData } from "./IGenerateWeaponRequest";
 export interface IGenerateEquipmentProperties {
     /** Root Slot being generated */
     rootEquipmentSlot: string;
diff --git a/types/models/spt/bots/IGenerateWeaponRequest.d.ts b/types/models/spt/bots/IGenerateWeaponRequest.d.ts
index 2c7135a0..3be9412c 100644
--- a/types/models/spt/bots/IGenerateWeaponRequest.d.ts
+++ b/types/models/spt/bots/IGenerateWeaponRequest.d.ts
@@ -1,6 +1,6 @@
-import type { IMods, IModsChances } from "@spt/models/eft/common/tables/IBotType";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IMods, IModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { BotModLimits } from "@spt/services/BotWeaponModLimitService";
 export interface IGenerateWeaponRequest {
     /** Weapon to add mods to / result that is returned */
diff --git a/types/models/spt/bots/IGenerateWeaponResult.d.ts b/types/models/spt/bots/IGenerateWeaponResult.d.ts
index bdcb41b8..8e1e318e 100644
--- a/types/models/spt/bots/IGenerateWeaponResult.d.ts
+++ b/types/models/spt/bots/IGenerateWeaponResult.d.ts
@@ -1,6 +1,6 @@
-import type { IMods } from "@spt/models/eft/common/tables/IBotType";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IMods } from "@spt/models/eft/common/tables/IBotType";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 export interface IGenerateWeaponResult {
     weapon: IItem[];
     chosenAmmoTpl: string;
diff --git a/types/models/spt/bots/IModToSpawnRequest.d.ts b/types/models/spt/bots/IModToSpawnRequest.d.ts
index 38f4d027..c004664f 100644
--- a/types/models/spt/bots/IModToSpawnRequest.d.ts
+++ b/types/models/spt/bots/IModToSpawnRequest.d.ts
@@ -1,8 +1,8 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { ModSpawn } from "@spt/models/enums/ModSpawn";
-import type { IBotData, IWeaponStats } from "@spt/models/spt/bots/IGenerateWeaponRequest";
-import type { IEquipmentFilterDetails, IRandomisationDetails } from "@spt/models/spt/config/IBotConfig";
+import { IBotData, IWeaponStats } from "@spt/models/spt/bots/IGenerateWeaponRequest";
+import { IEquipmentFilterDetails, IRandomisationDetails } from "@spt/models/spt/config/IBotConfig";
 export interface IModToSpawnRequest {
     /** Slot mod will fit into */
     modSlot: string;
diff --git a/types/models/spt/callbacks/IBotCallbacks.d.ts b/types/models/spt/callbacks/IBotCallbacks.d.ts
index 52f27c42..e49406ea 100644
--- a/types/models/spt/callbacks/IBotCallbacks.d.ts
+++ b/types/models/spt/callbacks/IBotCallbacks.d.ts
@@ -1,7 +1,7 @@
-import type { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 export interface IBotCallbacks {
     getBotLimit(url: string, info: IEmptyRequestData, sessionID: string): string;
     getBotDifficulty(url: string, info: IEmptyRequestData, sessionID: string): string;
diff --git a/types/models/spt/callbacks/ICustomizationCallbacks.d.ts b/types/models/spt/callbacks/ICustomizationCallbacks.d.ts
index 16f31035..8dba3d7a 100644
--- a/types/models/spt/callbacks/ICustomizationCallbacks.d.ts
+++ b/types/models/spt/callbacks/ICustomizationCallbacks.d.ts
@@ -1,9 +1,9 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { ISuit } from "@spt/models/eft/common/tables/ITrader";
-import type { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData";
-import type { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { ISuit } from "@spt/models/eft/common/tables/ITrader";
+import { IBuyClothingRequestData } from "@spt/models/eft/customization/IBuyClothingRequestData";
+import { IWearClothingRequestData } from "@spt/models/eft/customization/IWearClothingRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export interface ICustomizationCallbacks {
     getSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<any>;
     getTraderSuits(url: string, info: any, sessionID: string): IGetBodyResponseData<ISuit[]>;
diff --git a/types/models/spt/callbacks/IDialogueCallbacks.d.ts b/types/models/spt/callbacks/IDialogueCallbacks.d.ts
index 31b78431..2ff36dca 100644
--- a/types/models/spt/callbacks/IDialogueCallbacks.d.ts
+++ b/types/models/spt/callbacks/IDialogueCallbacks.d.ts
@@ -1,20 +1,20 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
-import type { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData";
-import type { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
-import type { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData";
-import type { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
-import type { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData";
-import type { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData";
-import type { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
-import type { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
-import type { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData";
-import type { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData";
-import type { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
-import type { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IDialogueInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IFriendRequestData } from "@spt/models/eft/dialog/IFriendRequestData";
+import { IGetAllAttachmentsRequestData } from "@spt/models/eft/dialog/IGetAllAttachmentsRequestData";
+import { IGetAllAttachmentsResponse } from "@spt/models/eft/dialog/IGetAllAttachmentsResponse";
+import { IGetChatServerListRequestData } from "@spt/models/eft/dialog/IGetChatServerListRequestData";
+import { IGetFriendListDataResponse } from "@spt/models/eft/dialog/IGetFriendListDataResponse";
+import { IGetMailDialogInfoRequestData } from "@spt/models/eft/dialog/IGetMailDialogInfoRequestData";
+import { IGetMailDialogListRequestData } from "@spt/models/eft/dialog/IGetMailDialogListRequestData";
+import { IGetMailDialogViewRequestData } from "@spt/models/eft/dialog/IGetMailDialogViewRequestData";
+import { IGetMailDialogViewResponseData } from "@spt/models/eft/dialog/IGetMailDialogViewResponseData";
+import { IPinDialogRequestData } from "@spt/models/eft/dialog/IPinDialogRequestData";
+import { IRemoveDialogRequestData } from "@spt/models/eft/dialog/IRemoveDialogRequestData";
+import { ISendMessageRequest } from "@spt/models/eft/dialog/ISendMessageRequest";
+import { ISetDialogReadRequestData } from "@spt/models/eft/dialog/ISetDialogReadRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IDialogueInfo } from "@spt/models/eft/profile/ISptProfile";
 export interface IDialogueCallbacks {
     getFriendList(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<IGetFriendListDataResponse>;
     getChatServerList(url: string, info: IGetChatServerListRequestData, sessionID: string): IGetBodyResponseData<any[]>;
diff --git a/types/models/spt/callbacks/IGameCallbacks.d.ts b/types/models/spt/callbacks/IGameCallbacks.d.ts
index 71e0207d..21554dd6 100644
--- a/types/models/spt/callbacks/IGameCallbacks.d.ts
+++ b/types/models/spt/callbacks/IGameCallbacks.d.ts
@@ -1,9 +1,9 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
-import type { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData";
-import type { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGameConfigResponse } from "@spt/models/eft/game/IGameConfigResponse";
+import { IGameEmptyCrcRequestData } from "@spt/models/eft/game/IGameEmptyCrcRequestData";
+import { IVersionValidateRequestData } from "@spt/models/eft/game/IVersionValidateRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
 export interface IGameCallbacks {
     versionValidate(url: string, info: IVersionValidateRequestData, sessionID: string): INullResponseData;
     gameStart(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
diff --git a/types/models/spt/callbacks/IHealthCallbacks.d.ts b/types/models/spt/callbacks/IHealthCallbacks.d.ts
index e08a36ea..c0244a1d 100644
--- a/types/models/spt/callbacks/IHealthCallbacks.d.ts
+++ b/types/models/spt/callbacks/IHealthCallbacks.d.ts
@@ -1,9 +1,9 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
-import type { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
-import type { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
-import type { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHealthTreatmentRequestData } from "@spt/models/eft/health/IHealthTreatmentRequestData";
+import { IOffraidEatRequestData } from "@spt/models/eft/health/IOffraidEatRequestData";
+import { IOffraidHealRequestData } from "@spt/models/eft/health/IOffraidHealRequestData";
+import { ISyncHealthRequestData } from "@spt/models/eft/health/ISyncHealthRequestData";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export interface IHealthCallbacks {
     onLoad(sessionID: string): ISptProfile;
     syncHealth(url: string, info: ISyncHealthRequestData, sessionID: string): any;
diff --git a/types/models/spt/callbacks/IHideoutCallbacks.d.ts b/types/models/spt/callbacks/IHideoutCallbacks.d.ts
index b5acf9d6..1349144e 100644
--- a/types/models/spt/callbacks/IHideoutCallbacks.d.ts
+++ b/types/models/spt/callbacks/IHideoutCallbacks.d.ts
@@ -1,14 +1,14 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData";
-import type { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData";
-import type { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData";
-import type { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData";
-import type { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData";
-import type { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
-import type { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData";
-import type { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeCompleteRequestData";
-import type { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHideoutContinuousProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutContinuousProductionStartRequestData";
+import { IHideoutPutItemInRequestData } from "@spt/models/eft/hideout/IHideoutPutItemInRequestData";
+import { IHideoutScavCaseStartRequestData } from "@spt/models/eft/hideout/IHideoutScavCaseStartRequestData";
+import { IHideoutSingleProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutSingleProductionStartRequestData";
+import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideoutTakeItemOutRequestData";
+import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
+import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData";
+import { IHideoutUpgradeCompleteRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeCompleteRequestData";
+import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export interface IHideoutCallbacks {
     upgrade(pmcData: IPmcData, body: IHideoutUpgradeRequestData, sessionID: string): IItemEventRouterResponse;
     upgradeComplete(pmcData: IPmcData, body: IHideoutUpgradeCompleteRequestData, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/IInsuranceCallbacks.d.ts b/types/models/spt/callbacks/IInsuranceCallbacks.d.ts
index 5778dca4..2fae550b 100644
--- a/types/models/spt/callbacks/IInsuranceCallbacks.d.ts
+++ b/types/models/spt/callbacks/IInsuranceCallbacks.d.ts
@@ -1,7 +1,7 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
-import type { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetInsuranceCostRequestData } from "@spt/models/eft/insurance/IGetInsuranceCostRequestData";
+import { IInsureRequestData } from "@spt/models/eft/insurance/IInsureRequestData";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export interface IInsuranceCallbacks {
     onLoad(sessionID: string): ISptProfile;
     getInsuranceCost(url: string, info: IGetInsuranceCostRequestData, sessionID: string): any;
diff --git a/types/models/spt/callbacks/IInventoryCallbacks.d.ts b/types/models/spt/callbacks/IInventoryCallbacks.d.ts
index 32578844..079d37bd 100644
--- a/types/models/spt/callbacks/IInventoryCallbacks.d.ts
+++ b/types/models/spt/callbacks/IInventoryCallbacks.d.ts
@@ -1,21 +1,21 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
-import type { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
-import type { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import type { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
-import type { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
-import type { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
-import type { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
-import type { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
-import type { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
-import type { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
-import type { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
-import type { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
-import type { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
-import type { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
-import type { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
-import type { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IInventoryBindRequestData } from "@spt/models/eft/inventory/IInventoryBindRequestData";
+import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IInventoryExamineRequestData } from "@spt/models/eft/inventory/IInventoryExamineRequestData";
+import { IInventoryFoldRequestData } from "@spt/models/eft/inventory/IInventoryFoldRequestData";
+import { IInventoryMergeRequestData } from "@spt/models/eft/inventory/IInventoryMergeRequestData";
+import { IInventoryMoveRequestData } from "@spt/models/eft/inventory/IInventoryMoveRequestData";
+import { IInventoryReadEncyclopediaRequestData } from "@spt/models/eft/inventory/IInventoryReadEncyclopediaRequestData";
+import { IInventoryRemoveRequestData } from "@spt/models/eft/inventory/IInventoryRemoveRequestData";
+import { IInventorySortRequestData } from "@spt/models/eft/inventory/IInventorySortRequestData";
+import { IInventorySplitRequestData } from "@spt/models/eft/inventory/IInventorySplitRequestData";
+import { IInventorySwapRequestData } from "@spt/models/eft/inventory/IInventorySwapRequestData";
+import { IInventoryTagRequestData } from "@spt/models/eft/inventory/IInventoryTagRequestData";
+import { IInventoryToggleRequestData } from "@spt/models/eft/inventory/IInventoryToggleRequestData";
+import { IInventoryTransferRequestData } from "@spt/models/eft/inventory/IInventoryTransferRequestData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export interface IInventoryCallbacks {
     moveItem(pmcData: IPmcData, body: IInventoryMoveRequestData, sessionID: string): IItemEventRouterResponse;
     removeItem(pmcData: IPmcData, body: IInventoryRemoveRequestData, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/IItemEventCallbacks.d.ts b/types/models/spt/callbacks/IItemEventCallbacks.d.ts
index 312323e6..98fdb0b2 100644
--- a/types/models/spt/callbacks/IItemEventCallbacks.d.ts
+++ b/types/models/spt/callbacks/IItemEventCallbacks.d.ts
@@ -1,6 +1,6 @@
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export interface IItemEventCallbacks {
     handleEvents(url: string, info: IItemEventRouterRequest, sessionID: string): IGetBodyResponseData<IItemEventRouterResponse>;
 }
diff --git a/types/models/spt/callbacks/ILauncherCallbacks.d.ts b/types/models/spt/callbacks/ILauncherCallbacks.d.ts
index 02691f2d..d01ae526 100644
--- a/types/models/spt/callbacks/ILauncherCallbacks.d.ts
+++ b/types/models/spt/callbacks/ILauncherCallbacks.d.ts
@@ -1,8 +1,8 @@
-import type { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
-import type { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData";
-import type { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
-import type { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
-import type { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData";
+import { IChangeRequestData } from "@spt/models/eft/launcher/IChangeRequestData";
+import { IGetMiniProfileRequestData } from "@spt/models/eft/launcher/IGetMiniProfileRequestData";
+import { ILoginRequestData } from "@spt/models/eft/launcher/ILoginRequestData";
+import { IRegisterData } from "@spt/models/eft/launcher/IRegisterData";
+import { IRemoveProfileData } from "@spt/models/eft/launcher/IRemoveProfileData";
 export interface ILauncherCallbacks {
     connect(): string;
     login(url: string, info: ILoginRequestData, sessionID: string): string;
diff --git a/types/models/spt/callbacks/ILocationCallbacks.d.ts b/types/models/spt/callbacks/ILocationCallbacks.d.ts
index 5f900007..e51c7234 100644
--- a/types/models/spt/callbacks/ILocationCallbacks.d.ts
+++ b/types/models/spt/callbacks/ILocationCallbacks.d.ts
@@ -1,7 +1,7 @@
-import type { ILocationBase } from "@spt/models/eft/common/ILocationBase";
-import type { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { ILocationsGenerateAllResponse } from "@spt/models/eft/common/ILocationsSourceDestinationBase";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IGetLocationRequestData } from "@spt/models/eft/location/IGetLocationRequestData";
 export interface ILocationCallbacks {
     getLocationData(url: string, info: any, sessionID: string): IGetBodyResponseData<ILocationsGenerateAllResponse>;
     getLocation(url: string, info: IGetLocationRequestData, sessionID: string): IGetBodyResponseData<ILocationBase>;
diff --git a/types/models/spt/callbacks/INoteCallbacks.d.ts b/types/models/spt/callbacks/INoteCallbacks.d.ts
index 17df12c7..5ea2c96d 100644
--- a/types/models/spt/callbacks/INoteCallbacks.d.ts
+++ b/types/models/spt/callbacks/INoteCallbacks.d.ts
@@ -1,6 +1,6 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
 export interface INoteCallbacks {
     addNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
     editNote(pmcData: IPmcData, body: INoteActionData, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/INotifierCallbacks.d.ts b/types/models/spt/callbacks/INotifierCallbacks.d.ts
index e9acf813..9f1fae18 100644
--- a/types/models/spt/callbacks/INotifierCallbacks.d.ts
+++ b/types/models/spt/callbacks/INotifierCallbacks.d.ts
@@ -1,7 +1,7 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IUIDRequestData } from "@spt/models/eft/common/request/IUIDRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INotifierChannel } from "@spt/models/eft/notifier/INotifier";
 export interface INotifierCallbacks {
     /**
      * If we don't have anything to send, it's ok to not send anything back
diff --git a/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts b/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts
index 1c8405e1..b0d75bd6 100644
--- a/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts
+++ b/types/models/spt/callbacks/IPresetBuildCallbacks.d.ts
@@ -1,8 +1,8 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
-import type { IWeaponBuild } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPresetBuildActionRequestData } from "@spt/models/eft/presetBuild/IPresetBuildActionRequestData";
+import { IWeaponBuild } from "@spt/models/eft/profile/ISptProfile";
 export interface IPresetBuildCallbacks {
     getHandbookUserlist(url: string, info: any, sessionID: string): IGetBodyResponseData<IWeaponBuild[]>;
     saveWeaponBuild(pmcData: IPmcData, body: IPresetBuildActionRequestData, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/IProfileCallbacks.d.ts b/types/models/spt/callbacks/IProfileCallbacks.d.ts
index 5dd2457d..f769cfdb 100644
--- a/types/models/spt/callbacks/IProfileCallbacks.d.ts
+++ b/types/models/spt/callbacks/IProfileCallbacks.d.ts
@@ -1,12 +1,12 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
-import type { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
-import type { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
-import type { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
-import type { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
-import type { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IProfileChangeNicknameRequestData } from "@spt/models/eft/profile/IProfileChangeNicknameRequestData";
+import { IProfileChangeVoiceRequestData } from "@spt/models/eft/profile/IProfileChangeVoiceRequestData";
+import { IProfileCreateRequestData } from "@spt/models/eft/profile/IProfileCreateRequestData";
+import { ISearchFriendRequestData } from "@spt/models/eft/profile/ISearchFriendRequestData";
+import { ISearchFriendResponse } from "@spt/models/eft/profile/ISearchFriendResponse";
+import { IValidateNicknameRequestData } from "@spt/models/eft/profile/IValidateNicknameRequestData";
 export interface IProfileCallbacks {
     onLoad(sessionID: string): any;
     createProfile(url: string, info: IProfileCreateRequestData, sessionID: string): IGetBodyResponseData<any>;
diff --git a/types/models/spt/callbacks/IQuestCallbacks.d.ts b/types/models/spt/callbacks/IQuestCallbacks.d.ts
index b716720b..1a688a7a 100644
--- a/types/models/spt/callbacks/IQuestCallbacks.d.ts
+++ b/types/models/spt/callbacks/IQuestCallbacks.d.ts
@@ -1,14 +1,14 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IQuest } from "@spt/models/eft/common/tables/IQuest";
-import type { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
-import type { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
-import type { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
-import type { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData";
-import type { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IQuest } from "@spt/models/eft/common/tables/IQuest";
+import { IPmcDataRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAcceptQuestRequestData } from "@spt/models/eft/quests/IAcceptQuestRequestData";
+import { ICompleteQuestRequestData } from "@spt/models/eft/quests/ICompleteQuestRequestData";
+import { IHandoverQuestRequestData } from "@spt/models/eft/quests/IHandoverQuestRequestData";
+import { IListQuestsRequestData } from "@spt/models/eft/quests/IListQuestsRequestData";
+import { IRepeatableQuestChangeRequest } from "@spt/models/eft/quests/IRepeatableQuestChangeRequest";
 export interface IQuestCallbacks {
     changeRepeatableQuest(pmcData: IPmcData, body: IRepeatableQuestChangeRequest, sessionID: string): IItemEventRouterResponse;
     acceptQuest(pmcData: IPmcData, body: IAcceptQuestRequestData, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/IRagfairCallbacks.d.ts b/types/models/spt/callbacks/IRagfairCallbacks.d.ts
index ad697e93..dcad1ee7 100644
--- a/types/models/spt/callbacks/IRagfairCallbacks.d.ts
+++ b/types/models/spt/callbacks/IRagfairCallbacks.d.ts
@@ -1,13 +1,13 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData";
-import type { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
-import type { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
-import type { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
-import type { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
-import type { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IAddOfferRequestData } from "@spt/models/eft/ragfair/IAddOfferRequestData";
+import { IExtendOfferRequestData } from "@spt/models/eft/ragfair/IExtendOfferRequestData";
+import { IGetItemPriceResult } from "@spt/models/eft/ragfair/IGetItemPriceResult";
+import { IGetMarketPriceRequestData } from "@spt/models/eft/ragfair/IGetMarketPriceRequestData";
+import { IRemoveOfferRequestData } from "@spt/models/eft/ragfair/IRemoveOfferRequestData";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
 export interface IRagfairCallbacks {
     load(): void;
     search(url: string, info: ISearchRequestData, sessionID: string): IGetBodyResponseData<any>;
diff --git a/types/models/spt/callbacks/IRepairCallbacks.d.ts b/types/models/spt/callbacks/IRepairCallbacks.d.ts
index b4cf082e..e8d4fe1f 100644
--- a/types/models/spt/callbacks/IRepairCallbacks.d.ts
+++ b/types/models/spt/callbacks/IRepairCallbacks.d.ts
@@ -1,7 +1,7 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
-import type { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepairActionDataRequest } from "@spt/models/eft/repair/IRepairActionDataRequest";
+import { ITraderRepairActionDataRequest } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
 export interface IRepairCallbacks {
     traderRepair(pmcData: IPmcData, body: ITraderRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
     repair(pmcData: IPmcData, body: IRepairActionDataRequest, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/ITradeCallbacks.d.ts b/types/models/spt/callbacks/ITradeCallbacks.d.ts
index 177a92e1..9b71d935 100644
--- a/types/models/spt/callbacks/ITradeCallbacks.d.ts
+++ b/types/models/spt/callbacks/ITradeCallbacks.d.ts
@@ -1,7 +1,7 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
-import type { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IProcessBaseTradeRequestData } from "@spt/models/eft/trade/IProcessBaseTradeRequestData";
+import { IProcessRagfairTradeRequestData } from "@spt/models/eft/trade/IProcessRagfairTradeRequestData";
 export interface ITradeCallbacks {
     processTrade(pmcData: IPmcData, body: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     processRagfairTrade(pmcData: IPmcData, body: IProcessRagfairTradeRequestData, sessionID: string): IItemEventRouterResponse;
diff --git a/types/models/spt/callbacks/ITraderCallbacks.d.ts b/types/models/spt/callbacks/ITraderCallbacks.d.ts
index 6f1cdc6d..963e523f 100644
--- a/types/models/spt/callbacks/ITraderCallbacks.d.ts
+++ b/types/models/spt/callbacks/ITraderCallbacks.d.ts
@@ -1,6 +1,6 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { ITraderAssort, ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 export interface ITraderCallbacks {
     load(): void;
     getTraderSettings(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<ITraderBase[]>;
diff --git a/types/models/spt/callbacks/IWeatherCallbacks.d.ts b/types/models/spt/callbacks/IWeatherCallbacks.d.ts
index df60dba6..57134699 100644
--- a/types/models/spt/callbacks/IWeatherCallbacks.d.ts
+++ b/types/models/spt/callbacks/IWeatherCallbacks.d.ts
@@ -1,5 +1,5 @@
-import type { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { IEmptyRequestData } from "@spt/models/eft/common/IEmptyRequestData";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
 export interface IWeatherCallbacks {
     getWeather(url: string, info: IEmptyRequestData, sessionID: string): IGetBodyResponseData<any>;
 }
diff --git a/types/models/spt/config/IAirdropConfig.d.ts b/types/models/spt/config/IAirdropConfig.d.ts
index 323b0eaa..ceca3cc6 100644
--- a/types/models/spt/config/IAirdropConfig.d.ts
+++ b/types/models/spt/config/IAirdropConfig.d.ts
@@ -1,6 +1,6 @@
 import { MinMax } from "@spt/models/common/MinMax";
 import { AirdropTypeEnum, SptAirdropTypeEnum } from "@spt/models/enums/AirdropType";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IAirdropConfig extends IBaseConfig {
     kind: "spt-airdrop";
     airdropTypeWeightings: Record<SptAirdropTypeEnum, number>;
diff --git a/types/models/spt/config/IBackupConfig.d.ts b/types/models/spt/config/IBackupConfig.d.ts
index 2ccd0b83..06bb7475 100644
--- a/types/models/spt/config/IBackupConfig.d.ts
+++ b/types/models/spt/config/IBackupConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IBackupConfig extends IBaseConfig {
     kind: "spt-backup";
     enabled: boolean;
diff --git a/types/models/spt/config/IBotConfig.d.ts b/types/models/spt/config/IBotConfig.d.ts
index 468234e4..92f7b34e 100644
--- a/types/models/spt/config/IBotConfig.d.ts
+++ b/types/models/spt/config/IBotConfig.d.ts
@@ -1,7 +1,7 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
-import type { IBotDurability } from "@spt/models/spt/config/IBotDurability";
+import { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBotDurability } from "@spt/models/spt/config/IBotDurability";
 export interface IBotConfig extends IBaseConfig {
     kind: "spt-bot";
     /** How many variants of each bot should be generated on raid start */
diff --git a/types/models/spt/config/ICoreConfig.d.ts b/types/models/spt/config/ICoreConfig.d.ts
index 3830c760..aedba0cb 100644
--- a/types/models/spt/config/ICoreConfig.d.ts
+++ b/types/models/spt/config/ICoreConfig.d.ts
@@ -1,5 +1,5 @@
-import type { ISurveyResponseData } from "@spt/models/eft/game/ISurveyResponseData";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { ISurveyResponseData } from "@spt/models/eft/game/ISurveyResponseData";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface ICoreConfig extends IBaseConfig {
     kind: "spt-core";
     sptVersion: string;
diff --git a/types/models/spt/config/IGiftsConfig.d.ts b/types/models/spt/config/IGiftsConfig.d.ts
index f6ed6fa9..fb145813 100644
--- a/types/models/spt/config/IGiftsConfig.d.ts
+++ b/types/models/spt/config/IGiftsConfig.d.ts
@@ -1,10 +1,10 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import { GiftSenderType } from "@spt/models/enums/GiftSenderType";
 import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType";
 import { Traders } from "@spt/models/enums/Traders";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
-import type { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IProfileChangeEvent } from "@spt/models/spt/dialog/ISendMessageDetails";
 export interface IGiftsConfig extends IBaseConfig {
     kind: "spt-gifts";
     gifts: Record<string, IGift>;
diff --git a/types/models/spt/config/IHealthConfig.d.ts b/types/models/spt/config/IHealthConfig.d.ts
index 0cc8de47..f7521ca5 100644
--- a/types/models/spt/config/IHealthConfig.d.ts
+++ b/types/models/spt/config/IHealthConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IHealthConfig extends IBaseConfig {
     kind: "spt-health";
     healthMultipliers: IHealthMultipliers;
diff --git a/types/models/spt/config/IHideoutConfig.d.ts b/types/models/spt/config/IHideoutConfig.d.ts
index f62b1ea5..a2483a9e 100644
--- a/types/models/spt/config/IHideoutConfig.d.ts
+++ b/types/models/spt/config/IHideoutConfig.d.ts
@@ -1,5 +1,5 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IBaseConfig, IRunIntervalValues } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig, IRunIntervalValues } from "@spt/models/spt/config/IBaseConfig";
 export interface IHideoutConfig extends IBaseConfig {
     kind: "spt-hideout";
     /** How many seconds should pass before hideout crafts / fuel usage is checked and procesed */
diff --git a/types/models/spt/config/IHttpConfig.d.ts b/types/models/spt/config/IHttpConfig.d.ts
index d3418eee..0f42e776 100644
--- a/types/models/spt/config/IHttpConfig.d.ts
+++ b/types/models/spt/config/IHttpConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IHttpConfig extends IBaseConfig {
     kind: "spt-http";
     /** Address used by webserver */
diff --git a/types/models/spt/config/IInRaidConfig.d.ts b/types/models/spt/config/IInRaidConfig.d.ts
index a7813e1d..d70f6380 100644
--- a/types/models/spt/config/IInRaidConfig.d.ts
+++ b/types/models/spt/config/IInRaidConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IInRaidConfig extends IBaseConfig {
     kind: "spt-inraid";
     /** Overrides to apply to the pre-raid settings screen */
diff --git a/types/models/spt/config/IInsuranceConfig.d.ts b/types/models/spt/config/IInsuranceConfig.d.ts
index bde36970..fd15e947 100644
--- a/types/models/spt/config/IInsuranceConfig.d.ts
+++ b/types/models/spt/config/IInsuranceConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IInsuranceConfig extends IBaseConfig {
     kind: "spt-insurance";
     /** Chance item is returned as insurance, keyed by trader id */
diff --git a/types/models/spt/config/IItemConfig.d.ts b/types/models/spt/config/IItemConfig.d.ts
index d4dacf1c..ee8a8025 100644
--- a/types/models/spt/config/IItemConfig.d.ts
+++ b/types/models/spt/config/IItemConfig.d.ts
@@ -1,4 +1,5 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IItemConfig extends IBaseConfig {
     kind: "spt-item";
     /** Items that should be globally blacklisted */
@@ -12,6 +13,8 @@ export interface IItemConfig extends IBaseConfig {
     /** Items that can only be found on bosses */
     bossItems: string[];
     handbookPriceOverride: Record<string, IHandbookPriceOverride>;
+    /** Presets to add to the globals.json `ItemPresets` dictionary on server start */
+    customItemGlobalPresets: IPreset[];
 }
 export interface IHandbookPriceOverride {
     /** Price in roubles */
diff --git a/types/models/spt/config/ILocaleConfig.d.ts b/types/models/spt/config/ILocaleConfig.d.ts
index 39221ec3..c3de13ed 100644
--- a/types/models/spt/config/ILocaleConfig.d.ts
+++ b/types/models/spt/config/ILocaleConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface ILocaleConfig extends IBaseConfig {
     kind: "spt-locale";
     /** e.g. ru/en/cn/fr etc, or 'system', will take computer locale setting */
diff --git a/types/models/spt/config/ILocationConfig.d.ts b/types/models/spt/config/ILocationConfig.d.ts
index d6ede3bd..cbccd204 100644
--- a/types/models/spt/config/ILocationConfig.d.ts
+++ b/types/models/spt/config/ILocationConfig.d.ts
@@ -1,6 +1,6 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IBossLocationSpawn, IWave } from "@spt/models/eft/common/ILocationBase";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBossLocationSpawn, IWave } from "@spt/models/eft/common/ILocationBase";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface ILocationConfig extends IBaseConfig {
     kind: "spt-location";
     /** Rogues are classified as bosses and spawn immediatly, this can result in no scavs spawning, delay rogues spawning to allow scavs to spawn first */
diff --git a/types/models/spt/config/ILootConfig.d.ts b/types/models/spt/config/ILootConfig.d.ts
index 570a5e29..4e73ea0e 100644
--- a/types/models/spt/config/ILootConfig.d.ts
+++ b/types/models/spt/config/ILootConfig.d.ts
@@ -1,5 +1,5 @@
-import type { ISpawnpoint } from "@spt/models/eft/common/ILooseLoot";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { ISpawnpoint } from "@spt/models/eft/common/ILooseLoot";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface ILootConfig extends IBaseConfig {
     kind: "spt-loot";
     /** Spawn positions to add into a map, key=mapid */
diff --git a/types/models/spt/config/ILostOnDeathConfig.d.ts b/types/models/spt/config/ILostOnDeathConfig.d.ts
index 92ecd50b..71408ce4 100644
--- a/types/models/spt/config/ILostOnDeathConfig.d.ts
+++ b/types/models/spt/config/ILostOnDeathConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface ILostOnDeathConfig extends IBaseConfig {
     kind: "spt-lostondeath";
     /** What equipment in each slot should be lost on death */
diff --git a/types/models/spt/config/IMatchConfig.d.ts b/types/models/spt/config/IMatchConfig.d.ts
index 7704d2a1..f6a9b4c3 100644
--- a/types/models/spt/config/IMatchConfig.d.ts
+++ b/types/models/spt/config/IMatchConfig.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IMatchConfig extends IBaseConfig {
     kind: "spt-match";
     enabled: boolean;
diff --git a/types/models/spt/config/IPlayerScavConfig.d.ts b/types/models/spt/config/IPlayerScavConfig.d.ts
index b8653657..f684f45c 100644
--- a/types/models/spt/config/IPlayerScavConfig.d.ts
+++ b/types/models/spt/config/IPlayerScavConfig.d.ts
@@ -1,5 +1,5 @@
-import type { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IGenerationData } from "@spt/models/eft/common/tables/IBotType";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IPlayerScavConfig extends IBaseConfig {
     kind: "spt-playerscav";
     karmaLevel: Record<string, IKarmaLevel>;
diff --git a/types/models/spt/config/IPmChatResponse.d.ts b/types/models/spt/config/IPmChatResponse.d.ts
index 3b7751f9..83fab346 100644
--- a/types/models/spt/config/IPmChatResponse.d.ts
+++ b/types/models/spt/config/IPmChatResponse.d.ts
@@ -1,4 +1,4 @@
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IPmcChatResponse extends IBaseConfig {
     kind: "spt-pmcchatresponse";
     victim: IResponseSettings;
diff --git a/types/models/spt/config/IPmcConfig.d.ts b/types/models/spt/config/IPmcConfig.d.ts
index 4a9eea0b..bfca7158 100644
--- a/types/models/spt/config/IPmcConfig.d.ts
+++ b/types/models/spt/config/IPmcConfig.d.ts
@@ -1,7 +1,7 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IChancedEnemy } from "@spt/models/eft/common/ILocationBase";
+import { IChancedEnemy } from "@spt/models/eft/common/ILocationBase";
 import { MemberCategory } from "@spt/models/enums/MemberCategory";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IPmcConfig extends IBaseConfig {
     kind: "spt-pmc";
     /** What game version should the PMC have */
@@ -14,6 +14,7 @@ export interface IPmcConfig extends IBaseConfig {
     pocketLoot: ISlotLootSettings;
     /** Global whitelist/blacklist of backpack loot for PMCs */
     backpackLoot: ISlotLootSettings;
+    globalLootBlacklist: string[];
     /** Use difficulty defined in config/bot.json/difficulty instead of chosen difficulty dropdown value */
     useDifficultyOverride: boolean;
     /** Difficulty override e.g. "AsOnline/Hard" */
diff --git a/types/models/spt/config/IQuestConfig.d.ts b/types/models/spt/config/IQuestConfig.d.ts
index c9aa22ac..19bb3aa4 100644
--- a/types/models/spt/config/IQuestConfig.d.ts
+++ b/types/models/spt/config/IQuestConfig.d.ts
@@ -1,7 +1,7 @@
 import { MinMax } from "@spt/models/common/MinMax";
 import { ELocationName } from "@spt/models/enums/ELocationName";
 import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IQuestConfig extends IBaseConfig {
     kind: "spt-quest";
     mailRedeemTimeHours: Record<string, number>;
diff --git a/types/models/spt/config/IRagfairConfig.d.ts b/types/models/spt/config/IRagfairConfig.d.ts
index c5a79495..805a6b2d 100644
--- a/types/models/spt/config/IRagfairConfig.d.ts
+++ b/types/models/spt/config/IRagfairConfig.d.ts
@@ -1,5 +1,5 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IBaseConfig, IRunIntervalValues } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig, IRunIntervalValues } from "@spt/models/spt/config/IBaseConfig";
 export interface IRagfairConfig extends IBaseConfig {
     kind: "spt-ragfair";
     /** How many seconds should pass before expired offers and procesed + player offers checked if sold */
diff --git a/types/models/spt/config/IRepairConfig.d.ts b/types/models/spt/config/IRepairConfig.d.ts
index 17dc531c..eca8e6c0 100644
--- a/types/models/spt/config/IRepairConfig.d.ts
+++ b/types/models/spt/config/IRepairConfig.d.ts
@@ -1,5 +1,5 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IRepairConfig extends IBaseConfig {
     kind: "spt-repair";
     priceMultiplier: number;
diff --git a/types/models/spt/config/IScavCaseConfig.d.ts b/types/models/spt/config/IScavCaseConfig.d.ts
index 9d59027d..949180ea 100644
--- a/types/models/spt/config/IScavCaseConfig.d.ts
+++ b/types/models/spt/config/IScavCaseConfig.d.ts
@@ -1,5 +1,5 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IScavCaseConfig extends IBaseConfig {
     kind: "spt-scavcase";
     rewardItemValueRangeRub: Record<string, MinMax>;
diff --git a/types/models/spt/config/ISeasonalEventConfig.d.ts b/types/models/spt/config/ISeasonalEventConfig.d.ts
index e22520ce..51f23acf 100644
--- a/types/models/spt/config/ISeasonalEventConfig.d.ts
+++ b/types/models/spt/config/ISeasonalEventConfig.d.ts
@@ -1,6 +1,7 @@
-import type { IAdditionalHostilitySettings, IBossLocationSpawn, IWave } from "@spt/models/eft/common/ILocationBase";
+import { IAdditionalHostilitySettings, IBossLocationSpawn, IWave } from "@spt/models/eft/common/ILocationBase";
+import { Season } from "@spt/models/enums/Season";
 import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface ISeasonalEventConfig extends IBaseConfig {
     kind: "spt-seasonalevents";
     enableSeasonalEventDetection: boolean;
@@ -15,6 +16,10 @@ export interface ISeasonalEventConfig extends IBaseConfig {
     gifterSettings: IGifterSetting[];
     /** key = event, second key = map name */
     hostilitySettingsForEvent: Record<string, Record<string, IAdditionalHostilitySettings[]>>;
+    /** Ids of containers on locations that only have christmas loot */
+    christmasContainerIds: string[];
+    /** Season - botType - location (body/feet/hands/head) */
+    botAppearanceChanges: Record<SeasonalEventType, Record<string, Record<string, Record<string, number>>>>;
 }
 export interface ISeasonalEvent {
     enabled: boolean;
@@ -24,14 +29,29 @@ export interface ISeasonalEvent {
     startMonth: number;
     endDay: number;
     endMonth: number;
-    settings?: Record<string, any>;
+    settings?: ISeasonalEventSettings;
 }
-export interface IZombieSettings {
-    enabled: boolean;
-    mapInfectionAmount: Record<string, number>;
+export interface ISeasonalEventSettings {
+    enableSummoning: boolean;
+    enableHalloweenHideout: boolean;
+    enableChristmasHideout: boolean;
+    enableSanta: boolean;
+    adjustBotAppearances: boolean;
+    addEventGearToBots: boolean;
+    addEventLootToBots: boolean;
+    removeEntryRequirement: string[];
+    replaceBotHostility: boolean;
+    forceSeason: Season;
+    zombieSettings?: IZombieSettings;
     disableBosses: string[];
     disableWaves: string[];
 }
+export interface IZombieSettings {
+    enabled?: boolean;
+    mapInfectionAmount?: Record<string, number>;
+    disableBosses?: string[];
+    disableWaves?: string[];
+}
 export interface IGifterSetting {
     map: string;
     zones: string;
diff --git a/types/models/spt/config/ITraderConfig.d.ts b/types/models/spt/config/ITraderConfig.d.ts
index 401e473b..2835a0d2 100644
--- a/types/models/spt/config/ITraderConfig.d.ts
+++ b/types/models/spt/config/ITraderConfig.d.ts
@@ -1,6 +1,6 @@
 import { MinMax } from "@spt/models/common/MinMax";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
-import type { ILootRequest } from "@spt/models/spt/services/ILootRequest";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { ILootRequest } from "@spt/models/spt/services/ILootRequest";
 export interface ITraderConfig extends IBaseConfig {
     kind: "spt-trader";
     updateTime: IUpdateTime[];
diff --git a/types/models/spt/config/IWeatherConfig.d.ts b/types/models/spt/config/IWeatherConfig.d.ts
index 3860a35b..fac2be11 100644
--- a/types/models/spt/config/IWeatherConfig.d.ts
+++ b/types/models/spt/config/IWeatherConfig.d.ts
@@ -1,7 +1,7 @@
 import { MinMax } from "@spt/models/common/MinMax";
 import { Season } from "@spt/models/enums/Season";
 import { WindDirection } from "@spt/models/enums/WindDirection";
-import type { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
+import { IBaseConfig } from "@spt/models/spt/config/IBaseConfig";
 export interface IWeatherConfig extends IBaseConfig {
     kind: "spt-weather";
     acceleration: number;
@@ -18,8 +18,13 @@ export interface ISeasonDateTimes {
     endMonth: number;
 }
 export interface IWeatherValues {
+    seasonValues: Record<string, ISeasonalValues>;
     /** How many hours to generate weather data into the future */
     generateWeatherAmountHours: number;
+    /** Length of each weather period */
+    timePeriod: WeatherSettings<number>;
+}
+export interface ISeasonalValues {
     clouds: WeatherSettings<string>;
     windSpeed: WeatherSettings<number>;
     windDirection: WeatherSettings<WindDirection>;
@@ -27,10 +32,8 @@ export interface IWeatherValues {
     rain: WeatherSettings<number>;
     rainIntensity: MinMax;
     fog: WeatherSettings<string>;
-    temp: Record<Season, ITempDayNight>;
+    temp: ITempDayNight;
     pressure: MinMax;
-    /** Length of each weather period */
-    timePeriod: WeatherSettings<number>;
 }
 export interface ITempDayNight {
     day: MinMax;
diff --git a/types/models/spt/controllers/IBotController.d.ts b/types/models/spt/controllers/IBotController.d.ts
index c346e511..329dd439 100644
--- a/types/models/spt/controllers/IBotController.d.ts
+++ b/types/models/spt/controllers/IBotController.d.ts
@@ -1,7 +1,7 @@
-import type { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
-import type { IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
+import { IGenerateBotsRequestData } from "@spt/models/eft/bot/IGenerateBotsRequestData";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotCore } from "@spt/models/eft/common/tables/IBotCore";
+import { IDifficultyCategories } from "@spt/models/eft/common/tables/IBotType";
 export interface IBotController {
     getBotLimit(type: string): number;
     getBotDifficulty(type: string, difficulty: string): IBotCore | IDifficultyCategories;
diff --git a/types/models/spt/dialog/ISendMessageDetails.d.ts b/types/models/spt/dialog/ISendMessageDetails.d.ts
index 163e4ef1..e3759edb 100644
--- a/types/models/spt/dialog/ISendMessageDetails.d.ts
+++ b/types/models/spt/dialog/ISendMessageDetails.d.ts
@@ -1,5 +1,7 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IMessageContentRagfair, ISystemData, IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IMessageContentRagfair } from "@spt/models/eft/profile/IMessageContentRagfair";
+import { ISystemData } from "@spt/models/eft/profile/ISystemData";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import { MessageType } from "@spt/models/enums/MessageType";
 import { Traders } from "@spt/models/enums/Traders";
 export interface ISendMessageDetails {
diff --git a/types/models/spt/fence/ICreateFenceAssortsResult.d.ts b/types/models/spt/fence/ICreateFenceAssortsResult.d.ts
index b0c73711..1af9f84d 100644
--- a/types/models/spt/fence/ICreateFenceAssortsResult.d.ts
+++ b/types/models/spt/fence/ICreateFenceAssortsResult.d.ts
@@ -1,5 +1,5 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
 export interface ICreateFenceAssortsResult {
     sptItems: IItem[][];
     barter_scheme: Record<string, IBarterScheme[][]>;
diff --git a/types/models/spt/generators/IBotGenerator.d.ts b/types/models/spt/generators/IBotGenerator.d.ts
index dca090ba..ebc954de 100644
--- a/types/models/spt/generators/IBotGenerator.d.ts
+++ b/types/models/spt/generators/IBotGenerator.d.ts
@@ -1,5 +1,5 @@
-import type { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
-import type { IChances, IGeneration, IInventory } from "@spt/models/eft/common/tables/IBotType";
+import { IInventory as PmcInventory } from "@spt/models/eft/common/tables/IBotBase";
+import { IChances, IGeneration, IInventory } from "@spt/models/eft/common/tables/IBotType";
 export interface IBotGenerator {
     generateInventory(templateInventory: IInventory, equipmentChances: IChances, generation: IGeneration, botRole: string, isPmc: boolean): PmcInventory;
 }
diff --git a/types/models/spt/generators/ILocationGenerator.d.ts b/types/models/spt/generators/ILocationGenerator.d.ts
index 6c3cd9fe..80905385 100644
--- a/types/models/spt/generators/ILocationGenerator.d.ts
+++ b/types/models/spt/generators/ILocationGenerator.d.ts
@@ -1,5 +1,5 @@
 import { IStaticAmmoDetails, IStaticContainerProps, IStaticForcedProps, IStaticLootDetails } from "@spt/models/eft/common/ILocation";
-import type { ILooseLoot, ISpawnpointTemplate } from "@spt/models/eft/common/ILooseLoot";
+import { ILooseLoot, ISpawnpointTemplate } from "@spt/models/eft/common/ILooseLoot";
 export interface ILocationGenerator {
     generateContainerLoot(containerIn: IStaticContainerProps, staticForced: IStaticForcedProps[], staticLootDist: Record<string, IStaticLootDetails>, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): IStaticContainerProps;
     generateDynamicLoot(dynamicLootDist: ILooseLoot, staticAmmoDist: Record<string, IStaticAmmoDetails[]>, locationName: string): ISpawnpointTemplate[];
diff --git a/types/models/spt/generators/IRagfairAssortGenerator.d.ts b/types/models/spt/generators/IRagfairAssortGenerator.d.ts
index 264b91df..380387ed 100644
--- a/types/models/spt/generators/IRagfairAssortGenerator.d.ts
+++ b/types/models/spt/generators/IRagfairAssortGenerator.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IRagfairAssortGenerator {
     getAssortItems(): IItem[];
 }
diff --git a/types/models/spt/generators/IRagfairOfferGenerator.d.ts b/types/models/spt/generators/IRagfairOfferGenerator.d.ts
index a2915103..e3d3f1b2 100644
--- a/types/models/spt/generators/IRagfairOfferGenerator.d.ts
+++ b/types/models/spt/generators/IRagfairOfferGenerator.d.ts
@@ -1,6 +1,6 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 export interface IRagfairOfferGenerator {
     createOffer(userID: string, time: number, items: IItem[], barterScheme: IBarterScheme[], loyalLevel: number, price: number, sellInOnePiece: boolean): IRagfairOffer;
 }
diff --git a/types/models/spt/hideout/ICircleCraftDetails.d.ts b/types/models/spt/hideout/ICircleCraftDetails.d.ts
index 7eff2d38..991e349c 100644
--- a/types/models/spt/hideout/ICircleCraftDetails.d.ts
+++ b/types/models/spt/hideout/ICircleCraftDetails.d.ts
@@ -1,5 +1,5 @@
 import { CircleRewardType } from "@spt/models/enums/hideout/CircleRewardType";
-import type { ICraftTimeThreshhold } from "@spt/models/spt/config/IHideoutConfig";
+import { ICraftTimeThreshhold } from "@spt/models/spt/config/IHideoutConfig";
 export interface ICircleCraftDetails {
     time: number;
     rewardType: CircleRewardType;
diff --git a/types/models/spt/inventory/IOwnerInventoryItems.d.ts b/types/models/spt/inventory/IOwnerInventoryItems.d.ts
index 172eddab..95ed39ec 100644
--- a/types/models/spt/inventory/IOwnerInventoryItems.d.ts
+++ b/types/models/spt/inventory/IOwnerInventoryItems.d.ts
@@ -1,4 +1,4 @@
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IOwnerInventoryItems {
     /** Inventory items from source */
     from: IItem[];
diff --git a/types/models/spt/mod/NewItemDetails.d.ts b/types/models/spt/mod/NewItemDetails.d.ts
index baa165b2..87de4295 100644
--- a/types/models/spt/mod/NewItemDetails.d.ts
+++ b/types/models/spt/mod/NewItemDetails.d.ts
@@ -1,4 +1,4 @@
-import type { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 export declare abstract class NewItemDetailsBase {
     /** Price of the item on flea market */
     fleaPriceRoubles: number;
diff --git a/types/models/spt/quests/IGetRepeatableByIdResult.d.ts b/types/models/spt/quests/IGetRepeatableByIdResult.d.ts
index 84e66296..cd57ec55 100644
--- a/types/models/spt/quests/IGetRepeatableByIdResult.d.ts
+++ b/types/models/spt/quests/IGetRepeatableByIdResult.d.ts
@@ -1,4 +1,4 @@
-import type { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
 export interface IGetRepeatableByIdResult {
     quest: IRepeatableQuest;
     repeatableType: IPmcDataRepeatableQuest;
diff --git a/types/models/spt/server/ExhaustableArray.d.ts b/types/models/spt/server/ExhaustableArray.d.ts
index ef03462c..50a6b687 100644
--- a/types/models/spt/server/ExhaustableArray.d.ts
+++ b/types/models/spt/server/ExhaustableArray.d.ts
@@ -1,5 +1,5 @@
 import { RandomUtil } from "@spt/utils/RandomUtil";
-import type { ICloner } from "@spt/utils/cloners/ICloner";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ExhaustableArray<T> implements IExhaustableArray<T> {
     private itemPool;
     private randomUtil;
diff --git a/types/models/spt/server/IDatabaseTables.d.ts b/types/models/spt/server/IDatabaseTables.d.ts
index 2c9ad5a3..8e4bc6af 100644
--- a/types/models/spt/server/IDatabaseTables.d.ts
+++ b/types/models/spt/server/IDatabaseTables.d.ts
@@ -1,13 +1,13 @@
-import type { IGlobals } from "@spt/models/eft/common/IGlobals";
-import type { IMatch } from "@spt/models/eft/common/tables/IMatch";
-import type { ITrader } from "@spt/models/eft/common/tables/ITrader";
-import type { IBots } from "@spt/models/spt/bots/IBots";
-import type { IHideout } from "@spt/models/spt/hideout/IHideout";
-import type { ILocaleBase } from "@spt/models/spt/server/ILocaleBase";
-import type { ILocations } from "@spt/models/spt/server/ILocations";
-import type { IServerBase } from "@spt/models/spt/server/IServerBase";
-import type { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-import type { ITemplates } from "@spt/models/spt/templates/ITemplates";
+import { IGlobals } from "@spt/models/eft/common/IGlobals";
+import { IMatch } from "@spt/models/eft/common/tables/IMatch";
+import { ITrader } from "@spt/models/eft/common/tables/ITrader";
+import { IBots } from "@spt/models/spt/bots/IBots";
+import { IHideout } from "@spt/models/spt/hideout/IHideout";
+import { ILocaleBase } from "@spt/models/spt/server/ILocaleBase";
+import { ILocations } from "@spt/models/spt/server/ILocations";
+import { IServerBase } from "@spt/models/spt/server/IServerBase";
+import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
+import { ITemplates } from "@spt/models/spt/templates/ITemplates";
 export interface IDatabaseTables {
     bots?: IBots;
     hideout?: IHideout;
diff --git a/types/models/spt/server/ILocations.d.ts b/types/models/spt/server/ILocations.d.ts
index 028cf7d5..500efcc7 100644
--- a/types/models/spt/server/ILocations.d.ts
+++ b/types/models/spt/server/ILocations.d.ts
@@ -1,5 +1,5 @@
-import type { ILocation } from "@spt/models/eft/common/ILocation";
-import type { ILocationsBase } from "@spt/models/eft/common/tables/ILocationsBase";
+import { ILocation } from "@spt/models/eft/common/ILocation";
+import { ILocationsBase } from "@spt/models/eft/common/tables/ILocationsBase";
 export interface ILocations {
     bigmap?: ILocation;
     develop?: ILocation;
diff --git a/types/models/spt/services/IInsuranceEquipmentPkg.d.ts b/types/models/spt/services/IInsuranceEquipmentPkg.d.ts
index 3f6f4b82..93aecfa0 100644
--- a/types/models/spt/services/IInsuranceEquipmentPkg.d.ts
+++ b/types/models/spt/services/IInsuranceEquipmentPkg.d.ts
@@ -1,5 +1,5 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
 export interface IInsuranceEquipmentPkg {
     sessionID: string;
     pmcData: IPmcData;
diff --git a/types/models/spt/templates/ITemplates.d.ts b/types/models/spt/templates/ITemplates.d.ts
index 319a4b15..e704aeab 100644
--- a/types/models/spt/templates/ITemplates.d.ts
+++ b/types/models/spt/templates/ITemplates.d.ts
@@ -11,7 +11,7 @@ import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem"
 import type { IDefaultEquipmentPreset } from "@spt/models/eft/profile/ISptProfile";
 export interface ITemplates {
     character: string[];
-    customisationStoage: ICustomisationStorage[];
+    customisationStorage: ICustomisationStorage[];
     items: Record<string, ITemplateItem>;
     prestige: IPrestige;
     quests: Record<string, IQuest>;
diff --git a/types/models/spt/utils/IAsyncQueue.d.ts b/types/models/spt/utils/IAsyncQueue.d.ts
index bfcb70cb..4bc91990 100644
--- a/types/models/spt/utils/IAsyncQueue.d.ts
+++ b/types/models/spt/utils/IAsyncQueue.d.ts
@@ -1,4 +1,4 @@
-import type { ICommand } from "@spt/models/spt/utils/ICommand";
+import { ICommand } from "@spt/models/spt/utils/ICommand";
 export interface IAsyncQueue {
     waitFor(command: ICommand): Promise<any>;
 }
diff --git a/types/models/spt/utils/ILogger.d.ts b/types/models/spt/utils/ILogger.d.ts
index a7d9a43a..32c4941a 100644
--- a/types/models/spt/utils/ILogger.d.ts
+++ b/types/models/spt/utils/ILogger.d.ts
@@ -1,4 +1,4 @@
-import type { IDaum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
+import { IDaum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
 import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor";
 import { LogTextColor } from "@spt/models/spt/logging/LogTextColor";
 export interface ILogger {
diff --git a/types/models/spt/weather/IGetLocalWeatherResponseData.d.ts b/types/models/spt/weather/IGetLocalWeatherResponseData.d.ts
index 63397a2c..ba1782b1 100644
--- a/types/models/spt/weather/IGetLocalWeatherResponseData.d.ts
+++ b/types/models/spt/weather/IGetLocalWeatherResponseData.d.ts
@@ -1,4 +1,4 @@
-import type { IWeather } from "@spt/models/eft/weather/IWeatherData";
+import { IWeather } from "@spt/models/eft/weather/IWeatherData";
 export interface IGetLocalWeatherResponseData {
     season: number;
     weather: IWeather[];
diff --git a/types/routers/EventOutputHolder.d.ts b/types/routers/EventOutputHolder.d.ts
index 141fb5b8..4d2c4792 100644
--- a/types/routers/EventOutputHolder.d.ts
+++ b/types/routers/EventOutputHolder.d.ts
@@ -1,8 +1,8 @@
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IHideoutImprovement, IMoneyTransferLimits, IProductive, ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
-import type { ITraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IHideoutImprovement, IMoneyTransferLimits, IProductive, ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
+import { ITraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { TimeUtil } from "@spt/utils/TimeUtil";
 import type { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class EventOutputHolder {
diff --git a/types/routers/HttpRouter.d.ts b/types/routers/HttpRouter.d.ts
index 952e01ca..5eb9af31 100644
--- a/types/routers/HttpRouter.d.ts
+++ b/types/routers/HttpRouter.d.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage } from "node:http";
+import { IncomingMessage } from "node:http";
 import { DynamicRouter, Router, StaticRouter } from "@spt/di/Router";
 export declare class HttpRouter {
     protected staticRouters: StaticRouter[];
diff --git a/types/routers/ImageRouter.d.ts b/types/routers/ImageRouter.d.ts
index 7a43f396..cd29c815 100644
--- a/types/routers/ImageRouter.d.ts
+++ b/types/routers/ImageRouter.d.ts
@@ -1,5 +1,5 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
-import type { ImageRouteService } from "@spt/services/mod/image/ImageRouteService";
+import { IncomingMessage, ServerResponse } from "node:http";
+import { ImageRouteService } from "@spt/services/mod/image/ImageRouteService";
 import { HttpFileUtil } from "@spt/utils/HttpFileUtil";
 import { VFS } from "@spt/utils/VFS";
 export declare class ImageRouter {
diff --git a/types/routers/ItemEventRouter.d.ts b/types/routers/ItemEventRouter.d.ts
index 89079160..ada0d89f 100644
--- a/types/routers/ItemEventRouter.d.ts
+++ b/types/routers/ItemEventRouter.d.ts
@@ -1,7 +1,7 @@
-import type { ItemEventRouterDefinition } from "@spt/di/Router";
+import { ItemEventRouterDefinition } from "@spt/di/Router";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IItemEventRouterRequest } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/routers/dynamic/HttpDynamicRouter.d.ts b/types/routers/dynamic/HttpDynamicRouter.d.ts
index a0118603..01d1ffb2 100644
--- a/types/routers/dynamic/HttpDynamicRouter.d.ts
+++ b/types/routers/dynamic/HttpDynamicRouter.d.ts
@@ -1,5 +1,5 @@
 import { DynamicRouter } from "@spt/di/Router";
-import type { ImageRouter } from "@spt/routers/ImageRouter";
+import { ImageRouter } from "@spt/routers/ImageRouter";
 export declare class HttpDynamicRouter extends DynamicRouter {
     protected imageRouter: ImageRouter;
     constructor(imageRouter: ImageRouter);
diff --git a/types/routers/dynamic/InraidDynamicRouter.d.ts b/types/routers/dynamic/InraidDynamicRouter.d.ts
index 95e3ef56..e4cf1ebe 100644
--- a/types/routers/dynamic/InraidDynamicRouter.d.ts
+++ b/types/routers/dynamic/InraidDynamicRouter.d.ts
@@ -1,4 +1,4 @@
-import type { InraidCallbacks } from "@spt/callbacks/InraidCallbacks";
+import { InraidCallbacks } from "@spt/callbacks/InraidCallbacks";
 import { DynamicRouter } from "@spt/di/Router";
 export declare class InraidDynamicRouter extends DynamicRouter {
     protected inraidCallbacks: InraidCallbacks;
diff --git a/types/routers/item_events/CustomizationItemEventRouter.d.ts b/types/routers/item_events/CustomizationItemEventRouter.d.ts
index 17b05c9c..c9babf34 100644
--- a/types/routers/item_events/CustomizationItemEventRouter.d.ts
+++ b/types/routers/item_events/CustomizationItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { CustomizationCallbacks } from "@spt/callbacks/CustomizationCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class CustomizationItemEventRouter extends ItemEventRouterDefinition {
     protected customizationCallbacks: CustomizationCallbacks;
     constructor(customizationCallbacks: CustomizationCallbacks);
diff --git a/types/routers/item_events/HealthItemEventRouter.d.ts b/types/routers/item_events/HealthItemEventRouter.d.ts
index e2a8285f..490884f2 100644
--- a/types/routers/item_events/HealthItemEventRouter.d.ts
+++ b/types/routers/item_events/HealthItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { HealthCallbacks } from "@spt/callbacks/HealthCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class HealthItemEventRouter extends ItemEventRouterDefinition {
     protected healthCallbacks: HealthCallbacks;
     constructor(healthCallbacks: HealthCallbacks);
diff --git a/types/routers/item_events/HideoutItemEventRouter.d.ts b/types/routers/item_events/HideoutItemEventRouter.d.ts
index c3740c5d..6839feee 100644
--- a/types/routers/item_events/HideoutItemEventRouter.d.ts
+++ b/types/routers/item_events/HideoutItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { HideoutCallbacks } from "@spt/callbacks/HideoutCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class HideoutItemEventRouter extends ItemEventRouterDefinition {
     protected hideoutCallbacks: HideoutCallbacks;
     constructor(hideoutCallbacks: HideoutCallbacks);
diff --git a/types/routers/item_events/InsuranceItemEventRouter.d.ts b/types/routers/item_events/InsuranceItemEventRouter.d.ts
index 9bd41d9c..af2b3dc5 100644
--- a/types/routers/item_events/InsuranceItemEventRouter.d.ts
+++ b/types/routers/item_events/InsuranceItemEventRouter.d.ts
@@ -1,7 +1,7 @@
-import type { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks";
+import { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InsuranceItemEventRouter extends ItemEventRouterDefinition {
     protected insuranceCallbacks: InsuranceCallbacks;
     constructor(insuranceCallbacks: InsuranceCallbacks);
diff --git a/types/routers/item_events/InventoryItemEventRouter.d.ts b/types/routers/item_events/InventoryItemEventRouter.d.ts
index 3aef403e..660de810 100644
--- a/types/routers/item_events/InventoryItemEventRouter.d.ts
+++ b/types/routers/item_events/InventoryItemEventRouter.d.ts
@@ -1,8 +1,8 @@
 import { HideoutCallbacks } from "@spt/callbacks/HideoutCallbacks";
-import type { InventoryCallbacks } from "@spt/callbacks/InventoryCallbacks";
+import { InventoryCallbacks } from "@spt/callbacks/InventoryCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class InventoryItemEventRouter extends ItemEventRouterDefinition {
     protected inventoryCallbacks: InventoryCallbacks;
     protected hideoutCallbacks: HideoutCallbacks;
diff --git a/types/routers/item_events/NoteItemEventRouter.d.ts b/types/routers/item_events/NoteItemEventRouter.d.ts
index f3065114..b415c3a0 100644
--- a/types/routers/item_events/NoteItemEventRouter.d.ts
+++ b/types/routers/item_events/NoteItemEventRouter.d.ts
@@ -1,8 +1,8 @@
 import { NoteCallbacks } from "@spt/callbacks/NoteCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { INoteActionData } from "@spt/models/eft/notes/INoteActionData";
 export declare class NoteItemEventRouter extends ItemEventRouterDefinition {
     protected noteCallbacks: NoteCallbacks;
     constructor(noteCallbacks: NoteCallbacks);
diff --git a/types/routers/item_events/QuestItemEventRouter.d.ts b/types/routers/item_events/QuestItemEventRouter.d.ts
index abd9b178..f0613c47 100644
--- a/types/routers/item_events/QuestItemEventRouter.d.ts
+++ b/types/routers/item_events/QuestItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { QuestCallbacks } from "@spt/callbacks/QuestCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 export declare class QuestItemEventRouter extends ItemEventRouterDefinition {
     protected logger: ILogger;
diff --git a/types/routers/item_events/RagfairItemEventRouter.d.ts b/types/routers/item_events/RagfairItemEventRouter.d.ts
index 6c5b4de2..09cdbf6f 100644
--- a/types/routers/item_events/RagfairItemEventRouter.d.ts
+++ b/types/routers/item_events/RagfairItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { RagfairCallbacks } from "@spt/callbacks/RagfairCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class RagfairItemEventRouter extends ItemEventRouterDefinition {
     protected ragfairCallbacks: RagfairCallbacks;
     constructor(ragfairCallbacks: RagfairCallbacks);
diff --git a/types/routers/item_events/RepairItemEventRouter.d.ts b/types/routers/item_events/RepairItemEventRouter.d.ts
index 9958de7b..d2f857d3 100644
--- a/types/routers/item_events/RepairItemEventRouter.d.ts
+++ b/types/routers/item_events/RepairItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { RepairCallbacks } from "@spt/callbacks/RepairCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class RepairItemEventRouter extends ItemEventRouterDefinition {
     protected repairCallbacks: RepairCallbacks;
     constructor(repairCallbacks: RepairCallbacks);
diff --git a/types/routers/item_events/TradeItemEventRouter.d.ts b/types/routers/item_events/TradeItemEventRouter.d.ts
index 164bdae1..5617ab3f 100644
--- a/types/routers/item_events/TradeItemEventRouter.d.ts
+++ b/types/routers/item_events/TradeItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { TradeCallbacks } from "@spt/callbacks/TradeCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class TradeItemEventRouter extends ItemEventRouterDefinition {
     protected tradeCallbacks: TradeCallbacks;
     constructor(tradeCallbacks: TradeCallbacks);
diff --git a/types/routers/item_events/WishlistItemEventRouter.d.ts b/types/routers/item_events/WishlistItemEventRouter.d.ts
index 752fe9c7..712f484f 100644
--- a/types/routers/item_events/WishlistItemEventRouter.d.ts
+++ b/types/routers/item_events/WishlistItemEventRouter.d.ts
@@ -1,7 +1,7 @@
 import { WishlistCallbacks } from "@spt/callbacks/WishlistCallbacks";
 import { HandledRoute, ItemEventRouterDefinition } from "@spt/di/Router";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 export declare class WishlistItemEventRouter extends ItemEventRouterDefinition {
     protected wishlistCallbacks: WishlistCallbacks;
     constructor(wishlistCallbacks: WishlistCallbacks);
diff --git a/types/routers/save_load/HealthSaveLoadRouter.d.ts b/types/routers/save_load/HealthSaveLoadRouter.d.ts
index c3362238..df04248c 100644
--- a/types/routers/save_load/HealthSaveLoadRouter.d.ts
+++ b/types/routers/save_load/HealthSaveLoadRouter.d.ts
@@ -1,5 +1,5 @@
 import { HandledRoute, SaveLoadRouter } from "@spt/di/Router";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export declare class HealthSaveLoadRouter extends SaveLoadRouter {
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: ISptProfile): ISptProfile;
diff --git a/types/routers/save_load/InraidSaveLoadRouter.d.ts b/types/routers/save_load/InraidSaveLoadRouter.d.ts
index 3798c8ab..3ea61fa9 100644
--- a/types/routers/save_load/InraidSaveLoadRouter.d.ts
+++ b/types/routers/save_load/InraidSaveLoadRouter.d.ts
@@ -1,5 +1,5 @@
 import { HandledRoute, SaveLoadRouter } from "@spt/di/Router";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export declare class InraidSaveLoadRouter extends SaveLoadRouter {
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: ISptProfile): ISptProfile;
diff --git a/types/routers/save_load/InsuranceSaveLoadRouter.d.ts b/types/routers/save_load/InsuranceSaveLoadRouter.d.ts
index 870e1446..ba8cb8a2 100644
--- a/types/routers/save_load/InsuranceSaveLoadRouter.d.ts
+++ b/types/routers/save_load/InsuranceSaveLoadRouter.d.ts
@@ -1,5 +1,5 @@
 import { HandledRoute, SaveLoadRouter } from "@spt/di/Router";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export declare class InsuranceSaveLoadRouter extends SaveLoadRouter {
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: ISptProfile): ISptProfile;
diff --git a/types/routers/save_load/ProfileSaveLoadRouter.d.ts b/types/routers/save_load/ProfileSaveLoadRouter.d.ts
index ad7185c5..77d50bd6 100644
--- a/types/routers/save_load/ProfileSaveLoadRouter.d.ts
+++ b/types/routers/save_load/ProfileSaveLoadRouter.d.ts
@@ -1,5 +1,5 @@
 import { HandledRoute, SaveLoadRouter } from "@spt/di/Router";
-import type { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
+import { ISptProfile } from "@spt/models/eft/profile/ISptProfile";
 export declare class ProfileSaveLoadRouter extends SaveLoadRouter {
     getHandledRoutes(): HandledRoute[];
     handleLoad(profile: ISptProfile): ISptProfile;
diff --git a/types/routers/serializers/BundleSerializer.d.ts b/types/routers/serializers/BundleSerializer.d.ts
index 3ed7f0ff..ac133156 100644
--- a/types/routers/serializers/BundleSerializer.d.ts
+++ b/types/routers/serializers/BundleSerializer.d.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 import { Serializer } from "@spt/di/Serializer";
 import { BundleLoader } from "@spt/loaders/BundleLoader";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
diff --git a/types/routers/serializers/ImageSerializer.d.ts b/types/routers/serializers/ImageSerializer.d.ts
index de8d0015..84430c70 100644
--- a/types/routers/serializers/ImageSerializer.d.ts
+++ b/types/routers/serializers/ImageSerializer.d.ts
@@ -1,6 +1,6 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 import { Serializer } from "@spt/di/Serializer";
-import type { ImageRouter } from "@spt/routers/ImageRouter";
+import { ImageRouter } from "@spt/routers/ImageRouter";
 export declare class ImageSerializer extends Serializer {
     protected imageRouter: ImageRouter;
     constructor(imageRouter: ImageRouter);
diff --git a/types/routers/serializers/NotifySerializer.d.ts b/types/routers/serializers/NotifySerializer.d.ts
index 66f0139b..20d90957 100644
--- a/types/routers/serializers/NotifySerializer.d.ts
+++ b/types/routers/serializers/NotifySerializer.d.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 import { NotifierController } from "@spt/controllers/NotifierController";
 import { Serializer } from "@spt/di/Serializer";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
diff --git a/types/routers/static/InraidStaticRouter.d.ts b/types/routers/static/InraidStaticRouter.d.ts
index df6c45a9..2a0da3cf 100644
--- a/types/routers/static/InraidStaticRouter.d.ts
+++ b/types/routers/static/InraidStaticRouter.d.ts
@@ -1,4 +1,4 @@
-import type { InraidCallbacks } from "@spt/callbacks/InraidCallbacks";
+import { InraidCallbacks } from "@spt/callbacks/InraidCallbacks";
 import { StaticRouter } from "@spt/di/Router";
 export declare class InraidStaticRouter extends StaticRouter {
     protected inraidCallbacks: InraidCallbacks;
diff --git a/types/routers/static/InsuranceStaticRouter.d.ts b/types/routers/static/InsuranceStaticRouter.d.ts
index cd99f71a..99e394f7 100644
--- a/types/routers/static/InsuranceStaticRouter.d.ts
+++ b/types/routers/static/InsuranceStaticRouter.d.ts
@@ -1,4 +1,4 @@
-import type { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks";
+import { InsuranceCallbacks } from "@spt/callbacks/InsuranceCallbacks";
 import { StaticRouter } from "@spt/di/Router";
 export declare class InsuranceStaticRouter extends StaticRouter {
     protected insuranceCallbacks: InsuranceCallbacks;
diff --git a/types/routers/static/ItemEventStaticRouter.d.ts b/types/routers/static/ItemEventStaticRouter.d.ts
index b2414786..b23856d6 100644
--- a/types/routers/static/ItemEventStaticRouter.d.ts
+++ b/types/routers/static/ItemEventStaticRouter.d.ts
@@ -1,4 +1,4 @@
-import type { ItemEventCallbacks } from "@spt/callbacks/ItemEventCallbacks";
+import { ItemEventCallbacks } from "@spt/callbacks/ItemEventCallbacks";
 import { StaticRouter } from "@spt/di/Router";
 export declare class ItemEventStaticRouter extends StaticRouter {
     protected itemEventCallbacks: ItemEventCallbacks;
diff --git a/types/routers/static/PrestigeStaticRouter.d.ts b/types/routers/static/PrestigeStaticRouter.d.ts
index 7d7c0bff..5df3aaa6 100644
--- a/types/routers/static/PrestigeStaticRouter.d.ts
+++ b/types/routers/static/PrestigeStaticRouter.d.ts
@@ -1,4 +1,4 @@
-import type { PrestigeCallbacks } from "@project/src/callbacks/PrestigeCallbacks";
+import type { PrestigeCallbacks } from "@spt/callbacks/PrestigeCallbacks";
 import { StaticRouter } from "@spt/di/Router";
 export declare class PrestigeStaticRouter extends StaticRouter {
     protected prestigeCallbacks: PrestigeCallbacks;
diff --git a/types/servers/DatabaseServer.d.ts b/types/servers/DatabaseServer.d.ts
index 12e80778..c198a87f 100644
--- a/types/servers/DatabaseServer.d.ts
+++ b/types/servers/DatabaseServer.d.ts
@@ -1,4 +1,4 @@
-import type { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables";
+import { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables";
 export declare class DatabaseServer {
     protected tableData: IDatabaseTables;
     getTables(): IDatabaseTables;
diff --git a/types/servers/HttpServer.d.ts b/types/servers/HttpServer.d.ts
index 3dd7c8c8..dd490c69 100644
--- a/types/servers/HttpServer.d.ts
+++ b/types/servers/HttpServer.d.ts
@@ -1,11 +1,11 @@
 import { IncomingMessage, ServerResponse } from "node:http";
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { WebSocketServer } from "@spt/servers/WebSocketServer";
-import type { IHttpListener } from "@spt/servers/http/IHttpListener";
+import { IHttpListener } from "@spt/servers/http/IHttpListener";
 import { LocalisationService } from "@spt/services/LocalisationService";
 export declare class HttpServer {
     protected logger: ILogger;
@@ -28,7 +28,7 @@ export declare class HttpServer {
      * @param remoteAddress Address to check
      * @returns True if its local
      */
-    protected isLocalRequest(remoteAddress: string): boolean;
+    protected isLocalRequest(remoteAddress: string | undefined): boolean | undefined;
     protected getCookies(req: IncomingMessage): Record<string, string>;
     isStarted(): boolean;
 }
diff --git a/types/servers/RagfairServer.d.ts b/types/servers/RagfairServer.d.ts
index 39596460..bda0e8d4 100644
--- a/types/servers/RagfairServer.d.ts
+++ b/types/servers/RagfairServer.d.ts
@@ -1,9 +1,9 @@
 import { RagfairOfferGenerator } from "@spt/generators/RagfairOfferGenerator";
 import { TraderAssortHelper } from "@spt/helpers/TraderAssortHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/servers/SaveServer.d.ts b/types/servers/SaveServer.d.ts
index 5bf726c4..d51a3cb5 100644
--- a/types/servers/SaveServer.d.ts
+++ b/types/servers/SaveServer.d.ts
@@ -1,5 +1,5 @@
 import { SaveLoadRouter } from "@spt/di/Router";
-import type { ISptProfile, Info } from "@spt/models/eft/profile/ISptProfile";
+import { ISptProfile, Info } from "@spt/models/eft/profile/ISptProfile";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/servers/WebSocketServer.d.ts b/types/servers/WebSocketServer.d.ts
index 4ce7f4ac..bdbe7dbb 100644
--- a/types/servers/WebSocketServer.d.ts
+++ b/types/servers/WebSocketServer.d.ts
@@ -1,11 +1,12 @@
 import http, { IncomingMessage } from "node:http";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
-import type { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler";
+import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
-import { WebSocketServer as WSServer, WebSocket } from "ws";
+import { WebSocketServer as Server } from "ws";
+import { SPTWebSocket } from "./ws/SPTWebsocket";
 export declare class WebSocketServer {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
@@ -13,10 +14,10 @@ export declare class WebSocketServer {
     protected localisationService: LocalisationService;
     protected httpServerHelper: HttpServerHelper;
     protected webSocketConnectionHandlers: IWebSocketConnectionHandler[];
-    protected webSocketServer: WSServer;
+    protected webSocketServer: Server | undefined;
     constructor(logger: ILogger, randomUtil: RandomUtil, jsonUtil: JsonUtil, localisationService: LocalisationService, httpServerHelper: HttpServerHelper, webSocketConnectionHandlers: IWebSocketConnectionHandler[]);
-    getWebSocketServer(): WSServer;
+    getWebSocketServer(): Server | undefined;
     setupWebSocket(httpServer: http.Server): void;
     protected getRandomisedMessage(): string;
-    protected wsOnConnection(ws: WebSocket, req: IncomingMessage): void;
+    protected wsOnConnection(ws: SPTWebSocket, req: IncomingMessage): Promise<void>;
 }
diff --git a/types/servers/http/IHttpListener.d.ts b/types/servers/http/IHttpListener.d.ts
index d28347bd..50101489 100644
--- a/types/servers/http/IHttpListener.d.ts
+++ b/types/servers/http/IHttpListener.d.ts
@@ -1,4 +1,4 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 export interface IHttpListener {
     canHandle(sessionId: string, req: IncomingMessage): boolean;
     handle(sessionId: string, req: IncomingMessage, resp: ServerResponse): Promise<void>;
diff --git a/types/servers/http/SptHttpListener.d.ts b/types/servers/http/SptHttpListener.d.ts
index d0bb4414..4489dae4 100644
--- a/types/servers/http/SptHttpListener.d.ts
+++ b/types/servers/http/SptHttpListener.d.ts
@@ -1,8 +1,8 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
+import { IncomingMessage, ServerResponse } from "node:http";
 import { Serializer } from "@spt/di/Serializer";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { HttpRouter } from "@spt/routers/HttpRouter";
-import type { IHttpListener } from "@spt/servers/http/IHttpListener";
+import { IHttpListener } from "@spt/servers/http/IHttpListener";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { JsonUtil } from "@spt/utils/JsonUtil";
@@ -26,7 +26,7 @@ export declare class SptHttpListener implements IHttpListener {
      * @param body Buffer
      * @param output Server generated response data
      */
-    sendResponse(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: Buffer, output: string): Promise<void>;
+    sendResponse(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: Buffer | undefined, output: string): Promise<void>;
     /**
      * Is request flagged as debug enabled
      * @param req Incoming request
@@ -39,8 +39,8 @@ export declare class SptHttpListener implements IHttpListener {
      * @param output Output string
      */
     protected logRequest(req: IncomingMessage, output: string): void;
-    getResponse(sessionID: string, req: IncomingMessage, body: Buffer): Promise<string>;
-    protected getBodyInfo(body: Buffer, requestUrl?: any): any;
+    getResponse(sessionID: string, req: IncomingMessage, body: Buffer | undefined): Promise<string>;
+    protected getBodyInfo(body: Buffer | undefined, requestUrl?: any): any;
     sendJson(resp: ServerResponse, output: string, sessionID: string): void;
     sendZlibJson(resp: ServerResponse, output: string, sessionID: string): Promise<void>;
 }
diff --git a/types/servers/ws/IWebSocketConnectionHandler.d.ts b/types/servers/ws/IWebSocketConnectionHandler.d.ts
index 27d84a73..ce89f91c 100644
--- a/types/servers/ws/IWebSocketConnectionHandler.d.ts
+++ b/types/servers/ws/IWebSocketConnectionHandler.d.ts
@@ -1,7 +1,7 @@
-import type { IncomingMessage } from "node:http";
-import { WebSocket } from "ws";
+import { IncomingMessage } from "node:http";
+import { SPTWebSocket } from "./SPTWebsocket";
 export interface IWebSocketConnectionHandler {
     getSocketId(): string;
     getHookUrl(): string;
-    onConnection(ws: WebSocket, req: IncomingMessage): void;
+    onConnection(ws: SPTWebSocket, req: IncomingMessage): Promise<void>;
 }
diff --git a/types/servers/ws/SPTWebsocket.d.ts b/types/servers/ws/SPTWebsocket.d.ts
new file mode 100644
index 00000000..ed3686e7
--- /dev/null
+++ b/types/servers/ws/SPTWebsocket.d.ts
@@ -0,0 +1,5 @@
+import WebSocket from "ws";
+export declare class SPTWebSocket extends WebSocket {
+    sendAsync(data: any): Promise<void>;
+    closeAsync(): Promise<void>;
+}
diff --git a/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/types/servers/ws/SptWebSocketConnectionHandler.d.ts
index aa679330..8670d7ea 100644
--- a/types/servers/ws/SptWebSocketConnectionHandler.d.ts
+++ b/types/servers/ws/SptWebSocketConnectionHandler.d.ts
@@ -1,14 +1,15 @@
-import type { IncomingMessage } from "node:http";
+import { IncomingMessage } from "node:http";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
-import type { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler";
-import type { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler";
+import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler";
+import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { WebSocket } from "ws";
+import { SPTWebSocket } from "./SPTWebsocket";
 export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler {
     protected logger: ILogger;
     protected profileHelper: ProfileHelper;
@@ -17,14 +18,14 @@ export declare class SptWebSocketConnectionHandler implements IWebSocketConnecti
     protected jsonUtil: JsonUtil;
     protected sptWebSocketMessageHandlers: ISptWebSocketMessageHandler[];
     protected httpConfig: IHttpConfig;
-    protected webSockets: Map<string, WebSocket>;
+    protected webSockets: Map<string, SPTWebSocket>;
     protected defaultNotification: IWsNotificationEvent;
     protected websocketPingHandler: NodeJS.Timeout | undefined;
     constructor(logger: ILogger, profileHelper: ProfileHelper, localisationService: LocalisationService, configServer: ConfigServer, jsonUtil: JsonUtil, sptWebSocketMessageHandlers: ISptWebSocketMessageHandler[]);
     getSocketId(): string;
     getHookUrl(): string;
-    onConnection(ws: WebSocket, req: IncomingMessage): void;
-    sendMessage(sessionID: string, output: IWsNotificationEvent): void;
+    onConnection(ws: SPTWebSocket, req: IncomingMessage): Promise<void>;
+    sendMessageAsync(sessionID: string, output: IWsNotificationEvent): Promise<void>;
     isConnectionWebSocket(sessionID: string): boolean;
     getSessionWebSocket(sessionID: string): WebSocket;
 }
diff --git a/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts
index 1031659d..072d40af 100644
--- a/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts
+++ b/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts
@@ -1,9 +1,9 @@
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
-import type { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler";
-import { WebSocket } from "ws";
-import type { RawData } from "ws";
+import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler";
+import { RawData } from "ws";
+import { SPTWebSocket } from "../SPTWebsocket";
 export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler {
     protected logger: ILogger;
     constructor(logger: ILogger);
-    onSptMessage(sessionId: string, client: WebSocket, message: RawData): void;
+    onSptMessage(sessionId: string, client: SPTWebSocket, message: RawData): Promise<void>;
 }
diff --git a/types/servers/ws/message/ISptWebSocketMessageHandler.d.ts b/types/servers/ws/message/ISptWebSocketMessageHandler.d.ts
index aa3bb131..e6dd4b62 100644
--- a/types/servers/ws/message/ISptWebSocketMessageHandler.d.ts
+++ b/types/servers/ws/message/ISptWebSocketMessageHandler.d.ts
@@ -1,5 +1,5 @@
-import { WebSocket } from "ws";
-import type { RawData } from "ws";
+import { RawData } from "ws";
+import { SPTWebSocket } from "../SPTWebsocket";
 export interface ISptWebSocketMessageHandler {
-    onSptMessage(sessionID: string, client: WebSocket, message: RawData): void;
+    onSptMessage(sessionID: string, client: SPTWebSocket, message: RawData): Promise<void>;
 }
diff --git a/types/services/AirdropService.d.ts b/types/services/AirdropService.d.ts
index 83b0a6e9..58cc2026 100644
--- a/types/services/AirdropService.d.ts
+++ b/types/services/AirdropService.d.ts
@@ -1,16 +1,16 @@
 import { LootGenerator } from "@spt/generators/LootGenerator";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IGetAirdropLootRequest } from "@spt/models/eft/location/IGetAirdropLootRequest";
-import type { IGetAirdropLootResponse } from "@spt/models/eft/location/IGetAirdropLootResponse";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IGetAirdropLootRequest } from "@spt/models/eft/location/IGetAirdropLootRequest";
+import { IGetAirdropLootResponse } from "@spt/models/eft/location/IGetAirdropLootResponse";
 import { AirdropTypeEnum, SptAirdropTypeEnum } from "@spt/models/enums/AirdropType";
-import type { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig";
-import type { IAirdropLootRequest } from "@spt/models/spt/services/ILootRequest";
+import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig";
+import { IAirdropLootRequest } from "@spt/models/spt/services/ILootRequest";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { HashUtil } from "@spt/utils/HashUtil";
 import type { ICloner } from "@spt/utils/cloners/ICloner";
diff --git a/types/services/BackupService.d.ts b/types/services/BackupService.d.ts
index 7b2b3cfb..d68d601d 100644
--- a/types/services/BackupService.d.ts
+++ b/types/services/BackupService.d.ts
@@ -1,5 +1,5 @@
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
-import type { IBackupConfig } from "@spt/models/spt/config/IBackupConfig";
+import { IBackupConfig } from "@spt/models/spt/config/IBackupConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class BackupService {
diff --git a/types/services/BotEquipmentFilterService.d.ts b/types/services/BotEquipmentFilterService.d.ts
index a056259d..75fdb289 100644
--- a/types/services/BotEquipmentFilterService.d.ts
+++ b/types/services/BotEquipmentFilterService.d.ts
@@ -1,8 +1,8 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { EquipmentChances, IBotType, IGeneration, IGenerationData, IModsChances } from "@spt/models/eft/common/tables/IBotType";
-import type { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
-import type { EquipmentFilters, IAdjustmentDetails, IBotConfig, IEquipmentFilterDetails, IWeightingAdjustmentDetails } from "@spt/models/spt/config/IBotConfig";
+import { EquipmentChances, IBotType, IGeneration, IGenerationData, IModsChances } from "@spt/models/eft/common/tables/IBotType";
+import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { EquipmentFilters, IAdjustmentDetails, IBotConfig, IEquipmentFilterDetails, IWeightingAdjustmentDetails } from "@spt/models/spt/config/IBotConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class BotEquipmentFilterService {
diff --git a/types/services/BotEquipmentModPoolService.d.ts b/types/services/BotEquipmentModPoolService.d.ts
index acb31ce9..dbf7257c 100644
--- a/types/services/BotEquipmentModPoolService.d.ts
+++ b/types/services/BotEquipmentModPoolService.d.ts
@@ -1,7 +1,7 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IMods } from "@spt/models/eft/common/tables/IBotType";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IMods } from "@spt/models/eft/common/tables/IBotType";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/BotGenerationCacheService.d.ts b/types/services/BotGenerationCacheService.d.ts
index 79e715c4..b46a21d8 100644
--- a/types/services/BotGenerationCacheService.d.ts
+++ b/types/services/BotGenerationCacheService.d.ts
@@ -1,5 +1,5 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { RandomUtil } from "@spt/utils/RandomUtil";
diff --git a/types/services/BotLootCacheService.d.ts b/types/services/BotLootCacheService.d.ts
index 99668f71..df986a2d 100644
--- a/types/services/BotLootCacheService.d.ts
+++ b/types/services/BotLootCacheService.d.ts
@@ -1,9 +1,8 @@
 import { PMCLootGenerator } from "@spt/generators/PMCLootGenerator";
 import { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IBotType } from "@spt/models/eft/common/tables/IBotType";
-import type { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import { LootCacheType } from "@spt/models/spt/bots/IBotLootCache";
-import type { IBotLootCache } from "@spt/models/spt/bots/IBotLootCache";
+import { IBotType } from "@spt/models/eft/common/tables/IBotType";
+import { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBotLootCache, LootCacheType } from "@spt/models/spt/bots/IBotLootCache";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/services/BotNameService.d.ts b/types/services/BotNameService.d.ts
index e270e74a..0a191f74 100644
--- a/types/services/BotNameService.d.ts
+++ b/types/services/BotNameService.d.ts
@@ -1,10 +1,10 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
-import type { IBotType } from "@spt/models/eft/common/tables/IBotType";
-import type { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotType } from "@spt/models/eft/common/tables/IBotType";
+import { IBotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { RandomUtil } from "@spt/utils/RandomUtil";
diff --git a/types/services/BotWeaponModLimitService.d.ts b/types/services/BotWeaponModLimitService.d.ts
index dbe195d8..5860f8c4 100644
--- a/types/services/BotWeaponModLimitService.d.ts
+++ b/types/services/BotWeaponModLimitService.d.ts
@@ -1,7 +1,7 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 export declare class BotModLimits {
diff --git a/types/services/CircleOfCultistService.d.ts b/types/services/CircleOfCultistService.d.ts
index 8a4845d8..c3cf513a 100644
--- a/types/services/CircleOfCultistService.d.ts
+++ b/types/services/CircleOfCultistService.d.ts
@@ -1,24 +1,24 @@
 import { HideoutHelper } from "@spt/helpers/HideoutHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBotHideoutArea } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IStageRequirement } from "@spt/models/eft/hideout/IHideoutArea";
-import type { IHideoutCircleOfCultistProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutCircleOfCultistProductionStartRequestData";
-import type { IRequirement, IRequirementBase } from "@spt/models/eft/hideout/IHideoutProduction";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { ICraftTimeThreshhold, ICultistCircleSettings, IDirectRewardSettings, IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
-import type { ICircleCraftDetails } from "@spt/models/spt/hideout/ICircleCraftDetails";
-import type { IHideout } from "@spt/models/spt/hideout/IHideout";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBotHideoutArea } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IStageRequirement } from "@spt/models/eft/hideout/IHideoutArea";
+import { IHideoutCircleOfCultistProductionStartRequestData } from "@spt/models/eft/hideout/IHideoutCircleOfCultistProductionStartRequestData";
+import { IRequirement, IRequirementBase } from "@spt/models/eft/hideout/IHideoutProduction";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { ICraftTimeThreshhold, ICultistCircleSettings, IDirectRewardSettings, IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { ICircleCraftDetails } from "@spt/models/spt/hideout/ICircleCraftDetails";
+import { IHideout } from "@spt/models/spt/hideout/IHideout";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemFilterService } from "@spt/services/ItemFilterService";
+import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
diff --git a/types/services/CustomLocationWaveService.d.ts b/types/services/CustomLocationWaveService.d.ts
index ed9f5acd..876b365e 100644
--- a/types/services/CustomLocationWaveService.d.ts
+++ b/types/services/CustomLocationWaveService.d.ts
@@ -1,5 +1,5 @@
-import type { IBossLocationSpawn, IWave } from "@spt/models/eft/common/ILocationBase";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IBossLocationSpawn, IWave } from "@spt/models/eft/common/ILocationBase";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/DatabaseService.d.ts b/types/services/DatabaseService.d.ts
index a73a7c34..39344092 100644
--- a/types/services/DatabaseService.d.ts
+++ b/types/services/DatabaseService.d.ts
@@ -1,23 +1,23 @@
-import type { IGlobals } from "@spt/models/eft/common/IGlobals";
-import type { ILocation } from "@spt/models/eft/common/ILocation";
-import type { IAchievement } from "@spt/models/eft/common/tables/IAchievement";
-import type { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem";
-import type { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
-import type { ILocationServices } from "@spt/models/eft/common/tables/ILocationServices";
-import type { IMatch } from "@spt/models/eft/common/tables/IMatch";
-import type { IProfileTemplates } from "@spt/models/eft/common/tables/IProfileTemplate";
-import type { IQuest } from "@spt/models/eft/common/tables/IQuest";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { ITrader } from "@spt/models/eft/common/tables/ITrader";
-import type { IBots } from "@spt/models/spt/bots/IBots";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
-import type { IHideout } from "@spt/models/spt/hideout/IHideout";
-import type { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables";
-import type { ILocaleBase } from "@spt/models/spt/server/ILocaleBase";
-import type { ILocations } from "@spt/models/spt/server/ILocations";
-import type { IServerBase } from "@spt/models/spt/server/IServerBase";
-import type { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
-import type { ITemplates } from "@spt/models/spt/templates/ITemplates";
+import { IGlobals } from "@spt/models/eft/common/IGlobals";
+import { ILocation } from "@spt/models/eft/common/ILocation";
+import { IAchievement } from "@spt/models/eft/common/tables/IAchievement";
+import { ICustomizationItem } from "@spt/models/eft/common/tables/ICustomizationItem";
+import { IHandbookBase } from "@spt/models/eft/common/tables/IHandbookBase";
+import { ILocationServices } from "@spt/models/eft/common/tables/ILocationServices";
+import { IMatch } from "@spt/models/eft/common/tables/IMatch";
+import { IProfileTemplates } from "@spt/models/eft/common/tables/IProfileTemplate";
+import { IQuest } from "@spt/models/eft/common/tables/IQuest";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ITrader } from "@spt/models/eft/common/tables/ITrader";
+import { IBots } from "@spt/models/spt/bots/IBots";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IHideout } from "@spt/models/spt/hideout/IHideout";
+import { IDatabaseTables } from "@spt/models/spt/server/IDatabaseTables";
+import { ILocaleBase } from "@spt/models/spt/server/ILocaleBase";
+import { ILocations } from "@spt/models/spt/server/ILocations";
+import { IServerBase } from "@spt/models/spt/server/IServerBase";
+import { ISettingsBase } from "@spt/models/spt/server/ISettingsBase";
+import { ITemplates } from "@spt/models/spt/templates/ITemplates";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/services/FenceService.d.ts b/types/services/FenceService.d.ts
index 26761f0a..317da9ea 100644
--- a/types/services/FenceService.d.ts
+++ b/types/services/FenceService.d.ts
@@ -1,14 +1,14 @@
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
-import type { IFenceLevel } from "@spt/models/eft/common/IGlobals";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem, IUpdRepairable } from "@spt/models/eft/common/tables/IItem";
-import type { ISlot, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IBarterScheme, ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
-import type { IItemDurabilityCurrentMax, ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
-import type { ICreateFenceAssortsResult } from "@spt/models/spt/fence/ICreateFenceAssortsResult";
-import type { IFenceAssortGenerationValues, IGenerationAssortValues } from "@spt/models/spt/fence/IFenceAssortGenerationValues";
+import { IFenceLevel } from "@spt/models/eft/common/IGlobals";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem, IUpdRepairable } from "@spt/models/eft/common/tables/IItem";
+import { ISlot, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IBarterScheme, ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { IItemDurabilityCurrentMax, ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ICreateFenceAssortsResult } from "@spt/models/spt/fence/ICreateFenceAssortsResult";
+import { IFenceAssortGenerationValues, IGenerationAssortValues } from "@spt/models/spt/fence/IFenceAssortGenerationValues";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/GiftService.d.ts b/types/services/GiftService.d.ts
index e6af887b..754fd938 100644
--- a/types/services/GiftService.d.ts
+++ b/types/services/GiftService.d.ts
@@ -1,7 +1,7 @@
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { GiftSentResult } from "@spt/models/enums/GiftSentResult";
 import { MessageType } from "@spt/models/enums/MessageType";
-import type { IGift, IGiftsConfig } from "@spt/models/spt/config/IGiftsConfig";
+import { IGift, IGiftsConfig } from "@spt/models/spt/config/IGiftsConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/services/InsuranceService.d.ts b/types/services/InsuranceService.d.ts
index 126a10da..33eb5cef 100644
--- a/types/services/InsuranceService.d.ts
+++ b/types/services/InsuranceService.d.ts
@@ -1,11 +1,11 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITraderBase } from "@spt/models/eft/common/tables/ITrader";
-import type { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
-import type { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITraderBase } from "@spt/models/eft/common/tables/ITrader";
+import { IInsuranceConfig } from "@spt/models/spt/config/IInsuranceConfig";
+import { IInsuranceEquipmentPkg } from "@spt/models/spt/services/IInsuranceEquipmentPkg";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
diff --git a/types/services/ItemBaseClassService.d.ts b/types/services/ItemBaseClassService.d.ts
index dbf9846b..6a5f90dd 100644
--- a/types/services/ItemBaseClassService.d.ts
+++ b/types/services/ItemBaseClassService.d.ts
@@ -1,4 +1,4 @@
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/services/ItemFilterService.d.ts b/types/services/ItemFilterService.d.ts
index dbd2a6b3..20e37e9f 100644
--- a/types/services/ItemFilterService.d.ts
+++ b/types/services/ItemFilterService.d.ts
@@ -1,4 +1,4 @@
-import type { IItemConfig } from "@spt/models/spt/config/IItemConfig";
+import { IItemConfig } from "@spt/models/spt/config/IItemConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
diff --git a/types/services/LegacyLocationLifecycleService.d.ts b/types/services/LegacyLocationLifecycleService.d.ts
index fcfb5afd..eb7cc335 100644
--- a/types/services/LegacyLocationLifecycleService.d.ts
+++ b/types/services/LegacyLocationLifecycleService.d.ts
@@ -3,24 +3,24 @@ import { LocationLootGenerator } from "@spt/generators/LocationLootGenerator";
 import { LootGenerator } from "@spt/generators/LootGenerator";
 import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator";
 import { HealthHelper } from "@spt/helpers/HealthHelper";
-import type { InRaidHelper } from "@spt/helpers/InRaidHelper";
+import { InRaidHelper } from "@spt/helpers/InRaidHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IEndOfflineRaidRequestData } from "@spt/models/eft/match/IEndOfflineRaidRequestData";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
-import type { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
-import type { IMatchConfig } from "@spt/models/spt/config/IMatchConfig";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IEndOfflineRaidRequestData } from "@spt/models/eft/match/IEndOfflineRaidRequestData";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IMatchConfig } from "@spt/models/spt/config/IMatchConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheService";
 import { BotLootCacheService } from "@spt/services/BotLootCacheService";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { InsuranceService } from "@spt/services/InsuranceService";
+import { InsuranceService } from "@spt/services/InsuranceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService";
diff --git a/types/services/LocaleService.d.ts b/types/services/LocaleService.d.ts
index eef3996c..5c16f3c5 100644
--- a/types/services/LocaleService.d.ts
+++ b/types/services/LocaleService.d.ts
@@ -1,4 +1,4 @@
-import type { ILocaleConfig } from "@spt/models/spt/config/ILocaleConfig";
+import { ILocaleConfig } from "@spt/models/spt/config/ILocaleConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
diff --git a/types/services/LocationLifecycleService.d.ts b/types/services/LocationLifecycleService.d.ts
index 65873e0a..d2122bd1 100644
--- a/types/services/LocationLifecycleService.d.ts
+++ b/types/services/LocationLifecycleService.d.ts
@@ -3,23 +3,23 @@ import { LocationLootGenerator } from "@spt/generators/LocationLootGenerator";
 import { LootGenerator } from "@spt/generators/LootGenerator";
 import { PlayerScavGenerator } from "@spt/generators/PlayerScavGenerator";
 import { HealthHelper } from "@spt/helpers/HealthHelper";
-import type { InRaidHelper } from "@spt/helpers/InRaidHelper";
+import { InRaidHelper } from "@spt/helpers/InRaidHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { ILocationBase } from "@spt/models/eft/common/ILocationBase";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { Common, IQuestStatus, ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IEndLocalRaidRequestData, IEndRaidResult } from "@spt/models/eft/match/IEndLocalRaidRequestData";
-import type { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
-import type { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
-import type { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { Common, IQuestStatus, ITraderInfo } from "@spt/models/eft/common/tables/IBotBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IEndLocalRaidRequestData, IEndRaidResult } from "@spt/models/eft/match/IEndLocalRaidRequestData";
+import { IStartLocalRaidRequestData } from "@spt/models/eft/match/IStartLocalRaidRequestData";
+import { IStartLocalRaidResponseData } from "@spt/models/eft/match/IStartLocalRaidResponseData";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
@@ -27,7 +27,7 @@ import { BotGenerationCacheService } from "@spt/services/BotGenerationCacheServi
 import { BotLootCacheService } from "@spt/services/BotLootCacheService";
 import { BotNameService } from "@spt/services/BotNameService";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { InsuranceService } from "@spt/services/InsuranceService";
+import { InsuranceService } from "@spt/services/InsuranceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService";
diff --git a/types/services/MailSendService.d.ts b/types/services/MailSendService.d.ts
index bfcd70dc..98f3137b 100644
--- a/types/services/MailSendService.d.ts
+++ b/types/services/MailSendService.d.ts
@@ -1,13 +1,16 @@
 import { DialogueHelper } from "@spt/helpers/DialogueHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper";
 import { NotifierHelper } from "@spt/helpers/NotifierHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IDialogue, IMessage, IMessageContentRagfair, IMessageItems, ISystemData, IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IMessageContentRagfair } from "@spt/models/eft/profile/IMessageContentRagfair";
+import { IDialogue, IMessage, IMessageItems } from "@spt/models/eft/profile/ISptProfile";
+import { ISystemData } from "@spt/models/eft/profile/ISystemData";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
 import { MessageType } from "@spt/models/enums/MessageType";
 import { Traders } from "@spt/models/enums/Traders";
-import type { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails";
+import { IProfileChangeEvent, ISendMessageDetails } from "@spt/models/spt/dialog/ISendMessageDetails";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/MapMarkerService.d.ts b/types/services/MapMarkerService.d.ts
index 8e348f2d..e87b7820 100644
--- a/types/services/MapMarkerService.d.ts
+++ b/types/services/MapMarkerService.d.ts
@@ -1,8 +1,8 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
-import type { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
-import type { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IInventoryCreateMarkerRequestData } from "@spt/models/eft/inventory/IInventoryCreateMarkerRequestData";
+import { IInventoryDeleteMarkerRequestData } from "@spt/models/eft/inventory/IInventoryDeleteMarkerRequestData";
+import { IInventoryEditMarkerRequestData } from "@spt/models/eft/inventory/IInventoryEditMarkerRequestData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 export declare class MapMarkerService {
     protected logger: ILogger;
diff --git a/types/services/MatchBotDetailsCacheService.d.ts b/types/services/MatchBotDetailsCacheService.d.ts
index 631bdf4b..734def43 100644
--- a/types/services/MatchBotDetailsCacheService.d.ts
+++ b/types/services/MatchBotDetailsCacheService.d.ts
@@ -1,4 +1,4 @@
-import type { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
+import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
 /** Cache bots in a dictionary, keyed by the bots name, keying by name isnt ideal as its not unique but this is used by the post-raid system which doesnt have any bot ids, only name */
diff --git a/types/services/ModCompilerService.d.ts b/types/services/ModCompilerService.d.ts
index 219cf8a3..eb4298c8 100644
--- a/types/services/ModCompilerService.d.ts
+++ b/types/services/ModCompilerService.d.ts
@@ -1,4 +1,4 @@
-import type { CompilerOptions } from "typescript";
+import { CompilerOptions } from "typescript";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ModHashCacheService } from "@spt/services/cache/ModHashCacheService";
 import { VFS } from "@spt/utils/VFS";
diff --git a/types/services/NotificationService.d.ts b/types/services/NotificationService.d.ts
index c574e47c..69d895aa 100644
--- a/types/services/NotificationService.d.ts
+++ b/types/services/NotificationService.d.ts
@@ -1,4 +1,4 @@
-import type { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
+import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 export declare class NotificationService {
     protected messageQueue: Record<string, any[]>;
     getMessageQueue(): Record<string, any[]>;
diff --git a/types/services/OpenZoneService.d.ts b/types/services/OpenZoneService.d.ts
index 4a01107f..c9d904e7 100644
--- a/types/services/OpenZoneService.d.ts
+++ b/types/services/OpenZoneService.d.ts
@@ -1,4 +1,4 @@
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/PaymentService.d.ts b/types/services/PaymentService.d.ts
index 344c93cf..5a5cf1f7 100644
--- a/types/services/PaymentService.d.ts
+++ b/types/services/PaymentService.d.ts
@@ -3,12 +3,12 @@ import { InventoryHelper } from "@spt/helpers/InventoryHelper";
 import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
-import type { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
-import type { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IProcessBuyTradeRequestData } from "@spt/models/eft/trade/IProcessBuyTradeRequestData";
+import { IProcessSellTradeRequestData } from "@spt/models/eft/trade/IProcessSellTradeRequestData";
+import { IInventoryConfig } from "@spt/models/spt/config/IInventoryConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/PlayerService.d.ts b/types/services/PlayerService.d.ts
index 0495c8b1..878dcb65 100644
--- a/types/services/PlayerService.d.ts
+++ b/types/services/PlayerService.d.ts
@@ -1,4 +1,4 @@
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/services/PmcChatResponseService.d.ts b/types/services/PmcChatResponseService.d.ts
index 9542c375..ddbffd3d 100644
--- a/types/services/PmcChatResponseService.d.ts
+++ b/types/services/PmcChatResponseService.d.ts
@@ -1,10 +1,10 @@
 import { NotificationSendHelper } from "@spt/helpers/NotificationSendHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IAggressor, IVictim } from "@spt/models/eft/common/tables/IBotBase";
-import type { IUserDialogInfo } from "@spt/models/eft/profile/ISptProfile";
-import type { IGiftsConfig } from "@spt/models/spt/config/IGiftsConfig";
-import type { IPmcChatResponse } from "@spt/models/spt/config/IPmChatResponse";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IAggressor, IVictim } from "@spt/models/eft/common/tables/IBotBase";
+import { IUserDialogInfo } from "@spt/models/eft/profile/IUserDialogInfo";
+import { IGiftsConfig } from "@spt/models/spt/config/IGiftsConfig";
+import { IPmcChatResponse } from "@spt/models/spt/config/IPmChatResponse";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { GiftService } from "@spt/services/GiftService";
diff --git a/types/services/PostDbLoadService.d.ts b/types/services/PostDbLoadService.d.ts
index 5d45f1bb..b0377c3f 100644
--- a/types/services/PostDbLoadService.d.ts
+++ b/types/services/PostDbLoadService.d.ts
@@ -1,15 +1,16 @@
-import type { IBotConfig } from "@spt/models/spt/config/IBotConfig";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
-import type { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
-import type { ILootConfig } from "@spt/models/spt/config/ILootConfig";
-import type { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
+import { IItemConfig } from "@spt/models/spt/config/IItemConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { ILootConfig } from "@spt/models/spt/config/ILootConfig";
+import { IPmcConfig } from "@spt/models/spt/config/IPmcConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { CustomLocationWaveService } from "@spt/services/CustomLocationWaveService";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
+import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { OpenZoneService } from "@spt/services/OpenZoneService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
@@ -31,6 +32,7 @@ export declare class PostDbLoadService {
     protected pmcConfig: IPmcConfig;
     protected lootConfig: ILootConfig;
     protected botConfig: IBotConfig;
+    protected itemConfig: IItemConfig;
     constructor(logger: ILogger, databaseService: DatabaseService, localisationService: LocalisationService, customLocationWaveService: CustomLocationWaveService, openZoneService: OpenZoneService, seasonalEventService: SeasonalEventService, itemBaseClassService: ItemBaseClassService, configServer: ConfigServer, cloner: ICloner);
     performPostDbLoadActions(): void;
     protected adjustMinReserveRaiderSpawnChance(): void;
@@ -42,10 +44,6 @@ export declare class PostDbLoadService {
     /** Apply custom limits on bot types as defined in configs/location.json/botTypeLimits */
     protected adjustMapBotLimits(): void;
     protected adjustLooseLootSpawnProbabilities(): void;
-    /**
-     * Out of date/incorrectly made trader mods forget this data
-     */
-    protected checkTraderRepairValuesExist(): void;
     protected adjustLocationBotValues(): void;
     /**
      * Make Rogues spawn later to allow for scavs to spawn first instead of rogues filling up all spawn positions
@@ -76,4 +74,5 @@ export declare class PostDbLoadService {
     protected setAllDbItemsAsSellableOnFlea(): void;
     protected addMissingTraderBuyRestrictionMaxValue(): void;
     protected applyFleaPriceOverrides(): void;
+    protected addCustomItemPresetsToGlobals(): void;
 }
diff --git a/types/services/ProfileFixerService.d.ts b/types/services/ProfileFixerService.d.ts
index 6f07f544..8ccd31bb 100644
--- a/types/services/ProfileFixerService.d.ts
+++ b/types/services/ProfileFixerService.d.ts
@@ -1,19 +1,19 @@
 import { HideoutHelper } from "@spt/helpers/HideoutHelper";
-import type { InventoryHelper } from "@spt/helpers/InventoryHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { InventoryHelper } from "@spt/helpers/InventoryHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { QuestHelper } from "@spt/helpers/QuestHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IBonus, IHideoutSlot } from "@spt/models/eft/common/tables/IBotBase";
-import type { IQuest, IQuestReward } from "@spt/models/eft/common/tables/IQuest";
-import type { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IStageBonus } from "@spt/models/eft/hideout/IHideoutArea";
-import type { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IBonus, IHideoutSlot } from "@spt/models/eft/common/tables/IBotBase";
+import { IQuest, IQuestReward } from "@spt/models/eft/common/tables/IQuest";
+import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IStageBonus } from "@spt/models/eft/hideout/IHideoutArea";
+import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile";
 import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/RagfairCategoriesService.d.ts b/types/services/RagfairCategoriesService.d.ts
index 5454707d..8ade9e62 100644
--- a/types/services/RagfairCategoriesService.d.ts
+++ b/types/services/RagfairCategoriesService.d.ts
@@ -1,6 +1,6 @@
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import { type ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { ISearchRequestData } from "@spt/models/eft/ragfair/ISearchRequestData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 export declare class RagfairCategoriesService {
     protected logger: ILogger;
diff --git a/types/services/RagfairLinkedItemService.d.ts b/types/services/RagfairLinkedItemService.d.ts
index be78b047..c184e522 100644
--- a/types/services/RagfairLinkedItemService.d.ts
+++ b/types/services/RagfairLinkedItemService.d.ts
@@ -1,5 +1,5 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 export declare class RagfairLinkedItemService {
diff --git a/types/services/RagfairOfferService.d.ts b/types/services/RagfairOfferService.d.ts
index 71a7ef9a..a5f011f2 100644
--- a/types/services/RagfairOfferService.d.ts
+++ b/types/services/RagfairOfferService.d.ts
@@ -1,9 +1,9 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
-import type { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { ConfigServer } from "@spt/servers/ConfigServer";
diff --git a/types/services/RagfairPriceService.d.ts b/types/services/RagfairPriceService.d.ts
index 4f66515d..6474670b 100644
--- a/types/services/RagfairPriceService.d.ts
+++ b/types/services/RagfairPriceService.d.ts
@@ -1,15 +1,15 @@
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 import { HandbookHelper } from "@spt/helpers/HandbookHelper";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { PresetHelper } from "@spt/helpers/PresetHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
-import type { MinMax } from "@spt/models/common/MinMax";
-import type { IPreset } from "@spt/models/eft/common/IGlobals";
-import type { IHandbookItem } from "@spt/models/eft/common/tables/IHandbookBase";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
-import type { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/IRagfairConfig";
-import type { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices";
+import { MinMax } from "@spt/models/common/MinMax";
+import { IPreset } from "@spt/models/eft/common/IGlobals";
+import { IHandbookItem } from "@spt/models/eft/common/tables/IHandbookBase";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { IBarterScheme } from "@spt/models/eft/common/tables/ITrader";
+import { IRagfairConfig, IUnreasonableModPrices } from "@spt/models/spt/config/IRagfairConfig";
+import { IRagfairServerPrices } from "@spt/models/spt/ragfair/IRagfairServerPrices";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/RagfairRequiredItemsService.d.ts b/types/services/RagfairRequiredItemsService.d.ts
index c72940ef..993a568d 100644
--- a/types/services/RagfairRequiredItemsService.d.ts
+++ b/types/services/RagfairRequiredItemsService.d.ts
@@ -1,5 +1,5 @@
 import { PaymentHelper } from "@spt/helpers/PaymentHelper";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { RagfairOfferService } from "@spt/services/RagfairOfferService";
 export declare class RagfairRequiredItemsService {
diff --git a/types/services/RagfairTaxService.d.ts b/types/services/RagfairTaxService.d.ts
index a6147968..241ce43c 100644
--- a/types/services/RagfairTaxService.d.ts
+++ b/types/services/RagfairTaxService.d.ts
@@ -1,9 +1,9 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IStorePlayerOfferTaxAmountRequestData } from "@spt/models/eft/ragfair/IStorePlayerOfferTaxAmountRequestData";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { RagfairPriceService } from "@spt/services/RagfairPriceService";
diff --git a/types/services/RaidTimeAdjustmentService.d.ts b/types/services/RaidTimeAdjustmentService.d.ts
index d0b1ba85..65c1e7e1 100644
--- a/types/services/RaidTimeAdjustmentService.d.ts
+++ b/types/services/RaidTimeAdjustmentService.d.ts
@@ -1,10 +1,10 @@
 import { ApplicationContext } from "@spt/context/ApplicationContext";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { ILocationBase } from "@spt/models/eft/common/ILocationBase";
-import type { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
-import type { ExtractChange, IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
-import type { ILocationConfig, ILootMultiplier, IScavRaidTimeLocationSettings } from "@spt/models/spt/config/ILocationConfig";
-import type { IRaidChanges } from "@spt/models/spt/location/IRaidChanges";
+import { ILocationBase } from "@spt/models/eft/common/ILocationBase";
+import { IGetRaidTimeRequest } from "@spt/models/eft/game/IGetRaidTimeRequest";
+import { ExtractChange, IGetRaidTimeResponse } from "@spt/models/eft/game/IGetRaidTimeResponse";
+import { ILocationConfig, ILootMultiplier, IScavRaidTimeLocationSettings } from "@spt/models/spt/config/ILocationConfig";
+import { IRaidChanges } from "@spt/models/spt/location/IRaidChanges";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/RaidWeatherService.d.ts b/types/services/RaidWeatherService.d.ts
index 14fb7f6d..c8a0e24c 100644
--- a/types/services/RaidWeatherService.d.ts
+++ b/types/services/RaidWeatherService.d.ts
@@ -1,8 +1,8 @@
 import { WeatherGenerator } from "@spt/generators/WeatherGenerator";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IWeather } from "@spt/models/eft/weather/IWeatherData";
+import { IWeather } from "@spt/models/eft/weather/IWeatherData";
 import { Season } from "@spt/models/enums/Season";
-import type { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
@@ -31,7 +31,7 @@ export declare class RaidWeatherService {
     /**
      * Find the first matching weather object that applies to the current time
      */
-    getCurrentWeather(): IWeather;
+    getCurrentWeather(): IWeather | undefined;
     /**
      * Find the first matching weather object that applies to the current time + all following weather data generated
      */
diff --git a/types/services/RepairService.d.ts b/types/services/RepairService.d.ts
index f9a2e908..d34fd9f9 100644
--- a/types/services/RepairService.d.ts
+++ b/types/services/RepairService.d.ts
@@ -1,17 +1,17 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { RepairHelper } from "@spt/helpers/RepairHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
 import { WeightedRandomHelper } from "@spt/helpers/WeightedRandomHelper";
-import type { IPmcData } from "@spt/models/eft/common/IPmcData";
-import type { IItem } from "@spt/models/eft/common/tables/IItem";
-import type { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import type { IRepairKitsInfo } from "@spt/models/eft/repair/IRepairActionDataRequest";
-import type { IRepairItem } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
+import { IPmcData } from "@spt/models/eft/common/IPmcData";
+import { IItem } from "@spt/models/eft/common/tables/IItem";
+import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IRepairKitsInfo } from "@spt/models/eft/repair/IRepairActionDataRequest";
+import { IRepairItem } from "@spt/models/eft/repair/ITraderRepairActionDataRequest";
 import { BonusType } from "@spt/models/enums/BonusType";
 import { SkillTypes } from "@spt/models/enums/SkillTypes";
-import type { IBonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
+import { IBonusSettings, IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
diff --git a/types/services/SeasonalEventService.d.ts b/types/services/SeasonalEventService.d.ts
index 798c6f8b..436ff4bf 100644
--- a/types/services/SeasonalEventService.d.ts
+++ b/types/services/SeasonalEventService.d.ts
@@ -1,15 +1,15 @@
 import { BotHelper } from "@spt/helpers/BotHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { IConfig } from "@spt/models/eft/common/IGlobals";
-import type { IAdditionalHostilitySettings } from "@spt/models/eft/common/ILocationBase";
-import type { IInventory } from "@spt/models/eft/common/tables/IBotType";
+import { IConfig } from "@spt/models/eft/common/IGlobals";
+import { IAdditionalHostilitySettings } from "@spt/models/eft/common/ILocationBase";
+import { IInventory } from "@spt/models/eft/common/tables/IBotType";
 import { Season } from "@spt/models/enums/Season";
 import { SeasonalEventType } from "@spt/models/enums/SeasonalEventType";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
-import type { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
-import type { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
-import type { ISeasonalEvent, ISeasonalEventConfig, IZombieSettings } from "@spt/models/spt/config/ISeasonalEventConfig";
-import type { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
+import { IQuestConfig } from "@spt/models/spt/config/IQuestConfig";
+import { ISeasonalEvent, ISeasonalEventConfig, IZombieSettings } from "@spt/models/spt/config/ISeasonalEventConfig";
+import { IWeatherConfig } from "@spt/models/spt/config/IWeatherConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
@@ -55,6 +55,11 @@ export declare class SeasonalEventService {
      * @returns
      */
     itemIsSeasonalRelated(itemTpl: string): boolean;
+    /**
+     * Get active seasonal events
+     * @returns Array of active events
+     */
+    getActiveEvents(): ISeasonalEvent[];
     /**
      * Get an array of seasonal items that should not appear
      * e.g. if halloween is active, only return christmas items
@@ -110,6 +115,11 @@ export declare class SeasonalEventService {
      * Handle activating seasonal events
      */
     enableSeasonalEvents(): void;
+    /**
+     * Force a seasonal event to be active
+     * @param eventType Event to force active
+     * @returns True if event was successfully force enabled
+     */
     forceSeasonalEvent(eventType: SeasonalEventType): boolean;
     /**
      * Store active events inside class array property `currentlyActiveEvents` + set class properties: christmasEventActive/halloweenEventActive
@@ -120,6 +130,18 @@ export declare class SeasonalEventService {
      * @returns Season enum value
      */
     getActiveWeatherSeason(): Season;
+    /**
+     * Does the provided date fit between the two defined dates?
+     * Excludes year
+     * Inclusive of end date upto 23 hours 59 minutes
+     * @param dateToCheck Date to check is between 2 dates
+     * @param startMonth Lower bound for month
+     * @param startDay Lower bound for day
+     * @param endMonth Upper bound for month
+     * @param endDay Upper bound for day
+     * @returns True when inside date range
+     */
+    protected dateIsBetweenTwoDates(dateToCheck: Date, startMonth: number, startDay: number, endMonth: number, endDay: number): boolean;
     /**
      * Iterate through bots inventory and loot to find and remove christmas items (as defined in SeasonalEventService)
      * @param botInventory Bots inventory to iterate over
@@ -132,6 +154,10 @@ export declare class SeasonalEventService {
      * @param eventName Name of the event to enable. e.g. Christmas
      */
     protected updateGlobalEvents(globalConfig: IConfig, event: ISeasonalEvent): void;
+    protected applyHalloweenEvent(event: ISeasonalEvent, globalConfig: IConfig): void;
+    protected applyChristmasEvent(event: ISeasonalEvent, globalConfig: IConfig): void;
+    protected applyNewYearsEvent(event: ISeasonalEvent, globalConfig: IConfig): void;
+    protected adjustBotAppearanceValues(season: SeasonalEventType): void;
     protected replaceBotHostility(hostilitySettings: Record<string, IAdditionalHostilitySettings[]>): void;
     protected removeEntryRequirement(locationIds: string[]): void;
     givePlayerSeasonalGifts(sessionId: string): void;
@@ -195,7 +221,7 @@ export declare class SeasonalEventService {
      * Add santa to maps
      */
     protected addGifterBotToMaps(): void;
-    protected handleModEvent(event: ISeasonalEvent): void;
+    protected handleModEvent(event: ISeasonalEvent, globalConfig: IConfig): void;
     /**
      * Send gift to player if they'e not already received it
      * @param playerId Player to send gift to
diff --git a/types/services/TraderAssortService.d.ts b/types/services/TraderAssortService.d.ts
index e223999e..48af0b79 100644
--- a/types/services/TraderAssortService.d.ts
+++ b/types/services/TraderAssortService.d.ts
@@ -1,4 +1,4 @@
-import type { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
+import { ITraderAssort } from "@spt/models/eft/common/tables/ITrader";
 export declare class TraderAssortService {
     protected pristineTraderAssorts: Record<string, ITraderAssort>;
     getPristineTraderAssort(traderId: string): ITraderAssort;
diff --git a/types/services/TraderPurchasePersisterService.d.ts b/types/services/TraderPurchasePersisterService.d.ts
index 0e625677..5e4877be 100644
--- a/types/services/TraderPurchasePersisterService.d.ts
+++ b/types/services/TraderPurchasePersisterService.d.ts
@@ -1,6 +1,6 @@
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
-import type { ITraderPurchaseData } from "@spt/models/eft/profile/ISptProfile";
-import type { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
+import { ITraderPurchaseData } from "@spt/models/eft/profile/ISptProfile";
+import { ITraderConfig } from "@spt/models/spt/config/ITraderConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
diff --git a/types/services/mod/CustomItemService.d.ts b/types/services/mod/CustomItemService.d.ts
index 56de2f62..c8173cb8 100644
--- a/types/services/mod/CustomItemService.d.ts
+++ b/types/services/mod/CustomItemService.d.ts
@@ -1,9 +1,9 @@
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
-import type { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
+import { IProps, ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetails } from "@spt/models/spt/mod/NewItemDetails";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import type { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
+import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
 import { HashUtil } from "@spt/utils/HashUtil";
 import type { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class CustomItemService {
diff --git a/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts
index a17cecf6..083934af 100644
--- a/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts
+++ b/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts
@@ -1,5 +1,5 @@
 import { RouteAction } from "@spt/di/Router";
-import type { DependencyContainer } from "tsyringe";
+import { type DependencyContainer } from "tsyringe";
 export declare class DynamicRouterModService {
     private container;
     constructor(container: DependencyContainer);
diff --git a/types/services/mod/httpListener/HttpListenerMod.d.ts b/types/services/mod/httpListener/HttpListenerMod.d.ts
index 9a71eef2..84c46c3c 100644
--- a/types/services/mod/httpListener/HttpListenerMod.d.ts
+++ b/types/services/mod/httpListener/HttpListenerMod.d.ts
@@ -1,5 +1,5 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
-import type { IHttpListener } from "@spt/servers/http/IHttpListener";
+import { IncomingMessage, ServerResponse } from "node:http";
+import { IHttpListener } from "@spt/servers/http/IHttpListener";
 export declare class HttpListenerMod implements IHttpListener {
     private canHandleOverride;
     private handleOverride;
diff --git a/types/services/mod/httpListener/HttpListenerModService.d.ts b/types/services/mod/httpListener/HttpListenerModService.d.ts
index 1600ae9a..4ebf915c 100644
--- a/types/services/mod/httpListener/HttpListenerModService.d.ts
+++ b/types/services/mod/httpListener/HttpListenerModService.d.ts
@@ -1,5 +1,5 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
-import type { DependencyContainer } from "tsyringe";
+import { IncomingMessage, ServerResponse } from "node:http";
+import { type DependencyContainer } from "tsyringe";
 export declare class HttpListenerModService {
     protected container: DependencyContainer;
     constructor(container: DependencyContainer);
diff --git a/types/services/mod/onLoad/OnLoadMod.d.ts b/types/services/mod/onLoad/OnLoadMod.d.ts
index 3b3d259f..65447040 100644
--- a/types/services/mod/onLoad/OnLoadMod.d.ts
+++ b/types/services/mod/onLoad/OnLoadMod.d.ts
@@ -1,4 +1,4 @@
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 export declare class OnLoadMod implements OnLoad {
     private onLoadOverride;
     private getRouteOverride;
diff --git a/types/services/mod/onLoad/OnLoadModService.d.ts b/types/services/mod/onLoad/OnLoadModService.d.ts
index c5719a58..d02ed003 100644
--- a/types/services/mod/onLoad/OnLoadModService.d.ts
+++ b/types/services/mod/onLoad/OnLoadModService.d.ts
@@ -1,4 +1,4 @@
-import type { DependencyContainer } from "tsyringe";
+import { type DependencyContainer } from "tsyringe";
 export declare class OnLoadModService {
     protected container: DependencyContainer;
     constructor(container: DependencyContainer);
diff --git a/types/services/mod/onUpdate/OnUpdateMod.d.ts b/types/services/mod/onUpdate/OnUpdateMod.d.ts
index 439662c6..3a8a26f3 100644
--- a/types/services/mod/onUpdate/OnUpdateMod.d.ts
+++ b/types/services/mod/onUpdate/OnUpdateMod.d.ts
@@ -1,4 +1,4 @@
-import type { OnUpdate } from "@spt/di/OnUpdate";
+import { OnUpdate } from "@spt/di/OnUpdate";
 export declare class OnUpdateMod implements OnUpdate {
     private onUpdateOverride;
     private getRouteOverride;
diff --git a/types/services/mod/onUpdate/OnUpdateModService.d.ts b/types/services/mod/onUpdate/OnUpdateModService.d.ts
index 93e3690c..67339a90 100644
--- a/types/services/mod/onUpdate/OnUpdateModService.d.ts
+++ b/types/services/mod/onUpdate/OnUpdateModService.d.ts
@@ -1,4 +1,4 @@
-import type { DependencyContainer } from "tsyringe";
+import { type DependencyContainer } from "tsyringe";
 export declare class OnUpdateModService {
     protected container: DependencyContainer;
     constructor(container: DependencyContainer);
diff --git a/types/services/mod/staticRouter/StaticRouterModService.d.ts b/types/services/mod/staticRouter/StaticRouterModService.d.ts
index 017a40b4..9551f89d 100644
--- a/types/services/mod/staticRouter/StaticRouterModService.d.ts
+++ b/types/services/mod/staticRouter/StaticRouterModService.d.ts
@@ -1,5 +1,5 @@
 import { RouteAction } from "@spt/di/Router";
-import type { DependencyContainer } from "tsyringe";
+import { type DependencyContainer } from "tsyringe";
 export declare class StaticRouterModService {
     protected container: DependencyContainer;
     constructor(container: DependencyContainer);
diff --git a/types/tools/HideoutCustomisation/HideoutCustomisationGen.d.ts b/types/tools/HideoutCustomisation/HideoutCustomisationGen.d.ts
new file mode 100644
index 00000000..cbf60d57
--- /dev/null
+++ b/types/tools/HideoutCustomisation/HideoutCustomisationGen.d.ts
@@ -0,0 +1,15 @@
+import { OnLoad } from "@spt/di/OnLoad";
+import type { ILogger } from "@spt/models/spt/utils/ILogger";
+import { DatabaseServer } from "@spt/servers/DatabaseServer";
+export declare class HideoutCustomisationGen {
+    protected databaseServer: DatabaseServer;
+    protected logger: ILogger;
+    protected onLoadComponents: OnLoad[];
+    private questCustomisationReward;
+    private achievementCustomisationReward;
+    constructor(databaseServer: DatabaseServer, logger: ILogger, onLoadComponents: OnLoad[]);
+    run(): Promise<void>;
+    private updateCustomisationStorage;
+    private buildQuestCustomisationList;
+    private buildAchievementRewardCustomisationList;
+}
diff --git a/types/tools/HideoutCustomisation/HideoutCustomisationProgram.d.ts b/types/tools/HideoutCustomisation/HideoutCustomisationProgram.d.ts
new file mode 100644
index 00000000..9fcb33d9
--- /dev/null
+++ b/types/tools/HideoutCustomisation/HideoutCustomisationProgram.d.ts
@@ -0,0 +1,6 @@
+import "reflect-metadata";
+import "source-map-support/register";
+export declare class HideoutCustomisationProgram {
+    constructor();
+    start(): Promise<void>;
+}
diff --git a/types/tools/ItemTplGenerator/ItemTplGenerator.d.ts b/types/tools/ItemTplGenerator/ItemTplGenerator.d.ts
index 65b78a10..57bcb90f 100644
--- a/types/tools/ItemTplGenerator/ItemTplGenerator.d.ts
+++ b/types/tools/ItemTplGenerator/ItemTplGenerator.d.ts
@@ -22,8 +22,8 @@
  * - The parent item type prefix is grouped more than the base item list, see "getParentName" for the rules around this
  * - Finalized enum names are created as a combination of the parent name, prefix, item name, and suffix
  */
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { ItemHelper } from "@spt/helpers/ItemHelper";
+import { OnLoad } from "@spt/di/OnLoad";
+import { ItemHelper } from "@spt/helpers/ItemHelper";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocaleService } from "@spt/services/LocaleService";
diff --git a/types/tools/ItemTplGenerator/ItemTplGeneratorProgram.d.ts b/types/tools/ItemTplGenerator/ItemTplGeneratorProgram.d.ts
index 304f6d83..994bef8e 100644
--- a/types/tools/ItemTplGenerator/ItemTplGeneratorProgram.d.ts
+++ b/types/tools/ItemTplGenerator/ItemTplGeneratorProgram.d.ts
@@ -1,5 +1,5 @@
-import "core-js";
 import "reflect-metadata";
+import "source-map-support/register";
 export declare class ItemTplGeneratorProgram {
     private errorHandler;
     constructor();
diff --git a/types/tools/ProductionQuestsGen/ProductionQuestsGen.d.ts b/types/tools/ProductionQuestsGen/ProductionQuestsGen.d.ts
index ca0663f3..bfc8ef06 100644
--- a/types/tools/ProductionQuestsGen/ProductionQuestsGen.d.ts
+++ b/types/tools/ProductionQuestsGen/ProductionQuestsGen.d.ts
@@ -1,4 +1,4 @@
-import type { OnLoad } from "@spt/di/OnLoad";
+import { OnLoad } from "@spt/di/OnLoad";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 export declare class ProductionQuestsGen {
diff --git a/types/tools/ProductionQuestsGen/ProductionQuestsGenProgram.d.ts b/types/tools/ProductionQuestsGen/ProductionQuestsGenProgram.d.ts
index 4b840a51..56637380 100644
--- a/types/tools/ProductionQuestsGen/ProductionQuestsGenProgram.d.ts
+++ b/types/tools/ProductionQuestsGen/ProductionQuestsGenProgram.d.ts
@@ -1,5 +1,5 @@
-import "core-js";
 import "reflect-metadata";
+import "source-map-support/register";
 export declare class ProductionQuestsGenProgram {
     private errorHandler;
     constructor();
diff --git a/types/tools/build/project.d.ts b/types/tools/build/project.d.ts
deleted file mode 100644
index 79600d69..00000000
--- a/types/tools/build/project.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export declare const arch: string;
-export declare const platform: string;
diff --git a/types/tools/build/task/buildInfo.d.ts b/types/tools/build/task/buildInfo.d.ts
deleted file mode 100644
index 0d5bb157..00000000
--- a/types/tools/build/task/buildInfo.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Asynchronously writes build information to a JSON file.
- */
-export declare const buildInfo: () => Promise<void>;
diff --git a/types/tools/build/task/clean.d.ts b/types/tools/build/task/clean.d.ts
deleted file mode 100644
index b237331f..00000000
--- a/types/tools/build/task/clean.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Asynchronously performs a pre-build clean operation.
- *
- * @returns A promise that resolves when the clean operation is complete.
- */
-export declare const cleanPre: () => Promise<void>;
-/**
- * Asynchronously performs post-compile clean-up tasks.
- *
- * @returns A promise that resolves when the clean-up tasks are complete.
- */
-export declare const cleanPost: () => Promise<void>;
diff --git a/types/tools/build/task/compile.d.ts b/types/tools/build/task/compile.d.ts
deleted file mode 100644
index ef7962be..00000000
--- a/types/tools/build/task/compile.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Compiles an executable from the given entry point.
- *
- * @param entryPoint - The entry point file to compile.
- * @returns A promise that resolves when the compilation is complete.
- */
-export declare const compile: (entryPoint: string) => Promise<void>;
-/**
- * Updates the properties of the executable file for the server.
- */
-export declare const updateExecutable: () => Promise<void>;
diff --git a/types/tools/build/task/copy.d.ts b/types/tools/build/task/copy.d.ts
deleted file mode 100644
index 8bbfc92d..00000000
--- a/types/tools/build/task/copy.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Copies specified files and directories to the './dist/' directory.
- */
-export declare const copy: () => Promise<void>;
diff --git a/types/tools/build/task/hashFile.d.ts b/types/tools/build/task/hashFile.d.ts
deleted file mode 100644
index a7e519ce..00000000
--- a/types/tools/build/task/hashFile.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Asynchronously creates a verification file named `checks.dat` in the specified directory.
- */
-export declare const hashFile: () => Promise<void>;
diff --git a/types/tools/build/util/getBuildOptions.d.ts b/types/tools/build/util/getBuildOptions.d.ts
deleted file mode 100644
index 11c6bfca..00000000
--- a/types/tools/build/util/getBuildOptions.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-interface BuildOptions {
-    type: string;
-    arch: string;
-    platform: string;
-    start: boolean;
-}
-/**
- * Parses the command line arguments and returns the build options.
- *
- * @param args - The command line arguments.
- * @returns The build options: `type`, `arch`, `platform`, and `start`.
- */
-export declare const getBuildOptions: (args: string[]) => BuildOptions;
-export {};
diff --git a/types/tools/build/util/log.d.ts b/types/tools/build/util/log.d.ts
deleted file mode 100644
index c9728d18..00000000
--- a/types/tools/build/util/log.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Logs a formatted header message to the console.
- *
- * @param header - The header message to be logged.
- */
-export declare function header(header: string): void;
diff --git a/types/tools/build/util/streamToString.d.ts b/types/tools/build/util/streamToString.d.ts
deleted file mode 100644
index d1a9b946..00000000
--- a/types/tools/build/util/streamToString.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Converts a ReadableStream of Uint8Array to a string.
- *
- * @param stream - The ReadableStream to convert. If null, the function returns null.
- * @returns A promise that resolves to the string representation of the stream's content, or null if the stream is null.
- */
-export declare function streamToString(stream: ReadableStream<Uint8Array> | null): Promise<string | null>;
diff --git a/types/utils/App.d.ts b/types/utils/App.d.ts
index 979d208c..6fcb86b8 100644
--- a/types/utils/App.d.ts
+++ b/types/utils/App.d.ts
@@ -1,6 +1,6 @@
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { OnUpdate } from "@spt/di/OnUpdate";
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { OnLoad } from "@spt/di/OnLoad";
+import { OnUpdate } from "@spt/di/OnUpdate";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { HttpServer } from "@spt/servers/HttpServer";
diff --git a/types/utils/AsyncQueue.d.ts b/types/utils/AsyncQueue.d.ts
index 54301577..a14181d6 100644
--- a/types/utils/AsyncQueue.d.ts
+++ b/types/utils/AsyncQueue.d.ts
@@ -1,5 +1,5 @@
-import type { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue";
-import type { ICommand } from "@spt/models/spt/utils/ICommand";
+import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue";
+import { ICommand } from "@spt/models/spt/utils/ICommand";
 export declare class AsyncQueue implements IAsyncQueue {
     protected commandsQueue: ICommand[];
     constructor();
diff --git a/types/utils/BunTimer.d.ts b/types/utils/BunTimer.d.ts
deleted file mode 100644
index 6becdf0e..00000000
--- a/types/utils/BunTimer.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * A utility class for measuring elapsed time using high-resolution nanosecond precision.
- */
-export declare class BunTimer {
-    private startTime;
-    private endTime;
-    /**
-     * Initializes a new instance of the `BunTimer` class and starts the timer.
-     */
-    constructor();
-    /**
-     * Starts or restarts the timer.
-     */
-    start(): void;
-    /**
-     * Stops the timer and returns the elapsed time.
-     *
-     * @returns {Object} An object containing the elapsed time in nanoseconds, milliseconds, and seconds.
-     * @returns {number} ns - The elapsed time in nanoseconds.
-     * @returns {number} ms - The elapsed time in milliseconds.
-     * @returns {number} sec - The elapsed time in seconds.
-     */
-    finish(): {
-        ns: number;
-        ms: number;
-        sec: number;
-    };
-}
diff --git a/types/utils/DatabaseImporter.d.ts b/types/utils/DatabaseImporter.d.ts
index 5ad22add..8ec1b711 100644
--- a/types/utils/DatabaseImporter.d.ts
+++ b/types/utils/DatabaseImporter.d.ts
@@ -1,13 +1,13 @@
-import type { OnLoad } from "@spt/di/OnLoad";
-import type { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
+import { OnLoad } from "@spt/di/OnLoad";
+import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
-import type { ImageRouter } from "@spt/routers/ImageRouter";
+import { ImageRouter } from "@spt/routers/ImageRouter";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { EncodingUtil } from "@spt/utils/EncodingUtil";
 import { HashUtil } from "@spt/utils/HashUtil";
-import type { ImporterUtil } from "@spt/utils/ImporterUtil";
+import { ImporterUtil } from "@spt/utils/ImporterUtil";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { VFS } from "@spt/utils/VFS";
 export declare class DatabaseImporter implements OnLoad {
@@ -32,17 +32,23 @@ export declare class DatabaseImporter implements OnLoad {
      */
     getSptDataPath(): string;
     onLoad(): Promise<void>;
+    /**
+     * Read all json files in database folder and map into a json object
+     * @param filepath path to database folder
+     */
     protected hydrateDatabase(filepath: string): Promise<void>;
     protected onReadValidate(fileWithPath: string, data: string): void;
+    getRoute(): string;
+    protected validateFile(filePathAndName: string, fileData: any): boolean;
     /**
-     * Normalize key paths to ensure consistency in how they were generated. Validation keys are are relative paths
-     * from the `assets` directory, normalized, no leading slash, forward slashes, and include the file extension.
-     * Example: `database/locations/sandbox/base.json`
-     *
-     * @param keyPath - The path that is being used for a validation check that needs to be normalized.
+     * Find and map files with image router inside a designated path
+     * @param filepath Path to find files in
      */
-    protected normalizeKeyPath(keyPath: string): string;
-    protected validateFile(filePathAndName: string, fileData: any): boolean;
     loadImages(filepath: string, directories: string[], routes: string[]): void;
+    /**
+     * Check for a path override in the http json config file
+     * @param imagePath Key
+     * @returns override for key
+     */
     protected getImagePathOverride(imagePath: string): string;
 }
diff --git a/types/utils/HttpResponseUtil.d.ts b/types/utils/HttpResponseUtil.d.ts
index 501e978b..ff845443 100644
--- a/types/utils/HttpResponseUtil.d.ts
+++ b/types/utils/HttpResponseUtil.d.ts
@@ -1,6 +1,6 @@
-import type { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
-import type { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
-import type { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
+import { IGetBodyResponseData } from "@spt/models/eft/httpResponse/IGetBodyResponseData";
+import { INullResponseData } from "@spt/models/eft/httpResponse/INullResponseData";
+import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
 import { BackendErrorCodes } from "@spt/models/enums/BackendErrorCodes";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
diff --git a/types/utils/JsonUtil.d.ts b/types/utils/JsonUtil.d.ts
index 570dbc0d..a1413b9b 100644
--- a/types/utils/JsonUtil.d.ts
+++ b/types/utils/JsonUtil.d.ts
@@ -1,7 +1,7 @@
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { VFS } from "@spt/utils/VFS";
-import type { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces";
+import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces";
 export declare class JsonUtil {
     protected vfs: VFS;
     protected hashUtil: HashUtil;
diff --git a/types/utils/ObjectId.d.ts b/types/utils/ObjectId.d.ts
index bb66a6cf..4f873447 100644
--- a/types/utils/ObjectId.d.ts
+++ b/types/utils/ObjectId.d.ts
@@ -2,7 +2,7 @@ import { TimeUtil } from "@spt/utils/TimeUtil";
 export declare class ObjectId {
     protected timeUtil: TimeUtil;
     constructor(timeUtil: TimeUtil);
-    protected randomBytes: Buffer<ArrayBufferLike>;
+    protected randomBytes: Buffer;
     protected constglobalCounter: number;
     protected consttime: number;
     protected globalCounter: number;
diff --git a/types/utils/RagfairOfferHolder.d.ts b/types/utils/RagfairOfferHolder.d.ts
index cbbf2e41..71cb4aac 100644
--- a/types/utils/RagfairOfferHolder.d.ts
+++ b/types/utils/RagfairOfferHolder.d.ts
@@ -1,6 +1,6 @@
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { RagfairServerHelper } from "@spt/helpers/RagfairServerHelper";
-import type { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
+import { IRagfairOffer } from "@spt/models/eft/ragfair/IRagfairOffer";
 export declare class RagfairOfferHolder {
     protected maxOffersPerTemplate: number;
     protected ragfairServerHelper: RagfairServerHelper;
diff --git a/types/utils/Watermark.d.ts b/types/utils/Watermark.d.ts
index 66e2b86d..2a9611c0 100644
--- a/types/utils/Watermark.d.ts
+++ b/types/utils/Watermark.d.ts
@@ -1,7 +1,7 @@
-import type { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
+import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import type { ILogger } from "@spt/models/spt/utils/ILogger";
+import { ConfigServer } from "@spt/servers/ConfigServer";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ConfigServer } from "../servers/ConfigServer";
 export declare class WatermarkLocale {
     protected localisationService: LocalisationService;
     protected description: string[];
diff --git a/types/utils/logging/AbstractWinstonLogger.d.ts b/types/utils/logging/AbstractWinstonLogger.d.ts
index 3c68b792..fb84b83d 100644
--- a/types/utils/logging/AbstractWinstonLogger.d.ts
+++ b/types/utils/logging/AbstractWinstonLogger.d.ts
@@ -1,10 +1,10 @@
 import fs from "node:fs";
-import type { IDaum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
+import { IDaum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
 import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor";
 import { LogTextColor } from "@spt/models/spt/logging/LogTextColor";
-import type { SptLogger } from "@spt/models/spt/logging/SptLogger";
-import type { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue";
-import type { ILogger } from "@spt/models/spt/utils/ILogger";
+import { SptLogger } from "@spt/models/spt/logging/SptLogger";
+import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue";
+import { ILogger } from "@spt/models/spt/utils/ILogger";
 import winston from "winston";
 export declare abstract class AbstractWinstonLogger implements ILogger {
     protected asyncQueue: IAsyncQueue;