strapi-plugin-magic-mail 2.0.2 → 2.0.3

package/dist/server/index.mjs

@@ -23,14 +23,14 @@ function requireBootstrap() {
   if (hasRequiredBootstrap) return bootstrap;
   hasRequiredBootstrap = 1;
   bootstrap = async ({ strapi: strapi2 }) => {
-    strapi2.log.info("🚀 [magic-mail] Bootstrap starting...");
+    strapi2.log.info("[BOOTSTRAP] [magic-mail] Starting...");
     try {
       const licenseGuardService = strapi2.plugin("magic-mail").service("license-guard");
       setTimeout(async () => {
         const licenseStatus = await licenseGuardService.initialize();
         if (!licenseStatus.valid && licenseStatus.demo) {
           strapi2.log.error("╔════════════════════════════════════════════════════════════════╗");
-          strapi2.log.error("║  ❌ MAGICMAIL - NO VALID LICENSE                              ║");
+          strapi2.log.error("║  [ERROR] MAGICMAIL - NO VALID LICENSE                         ║");
           strapi2.log.error("║                                                                ║");
           strapi2.log.error("║  This plugin requires a valid license to operate.             ║");
           strapi2.log.error("║  Please activate your license via Admin UI:                   ║");
@@ -39,7 +39,7 @@ function requireBootstrap() {
           strapi2.log.error('║  Click "Generate Free License" to get started!                ║');
           strapi2.log.error("╚════════════════════════════════════════════════════════════════╝");
         } else if (licenseStatus.gracePeriod) {
-          strapi2.log.warn("⚠️  Running on grace period (license server unreachable)");
+          strapi2.log.warn("[WARNING] Running on grace period (license server unreachable)");
         }
       }, 2e3);
       const accountManager2 = strapi2.plugin("magic-mail").service("account-manager");
@@ -48,7 +48,7 @@ function requireBootstrap() {
       if (originalEmailService && originalEmailService.send) {
         const originalSend = originalEmailService.send.bind(originalEmailService);
         originalEmailService.send = async (emailData) => {
-          strapi2.log.info("[magic-mail] 📧 Email intercepted from native Strapi service");
+          strapi2.log.info("[magic-mail] [EMAIL] Intercepted from native Strapi service");
           strapi2.log.debug("[magic-mail] Email data:", {
             to: emailData.to,
             subject: emailData.subject,
@@ -61,19 +61,19 @@ function requireBootstrap() {
               emailData.templateData = emailData.data;
             }
             const result = await emailRouter2.send(emailData);
-            strapi2.log.info("[magic-mail] ✅ Email routed successfully through MagicMail");
+            strapi2.log.info("[magic-mail] [SUCCESS] Email routed successfully through MagicMail");
             return result;
           } catch (magicMailError) {
-            strapi2.log.warn("[magic-mail] ⚠️  MagicMail routing failed, falling back to original service");
+            strapi2.log.warn("[magic-mail] [WARNING] MagicMail routing failed, falling back to original service");
             strapi2.log.error("[magic-mail] Error:", magicMailError.message);
             return await originalSend(emailData);
           }
         };
-        strapi2.log.info("[magic-mail] ✅ Native email service overridden!");
-        strapi2.log.info("[magic-mail] 💡 All strapi.plugins.email.services.email.send() calls will route through MagicMail");
+        strapi2.log.info("[magic-mail] [SUCCESS] Native email service overridden!");
+        strapi2.log.info("[magic-mail] [INFO] All strapi.plugins.email.services.email.send() calls will route through MagicMail");
       } else {
-        strapi2.log.warn("[magic-mail] ⚠️  Native email service not found - MagicMail will work standalone");
-        strapi2.log.warn("[magic-mail] 💡 Make sure @strapi/plugin-email is installed");
+        strapi2.log.warn("[magic-mail] [WARNING] Native email service not found - MagicMail will work standalone");
+        strapi2.log.warn("[magic-mail] [INFO] Make sure @strapi/plugin-email is installed");
       }
       const hourlyResetInterval = setInterval(async () => {
         try {
@@ -83,7 +83,7 @@ function requireBootstrap() {
           }
           const accountMgr = strapi2.plugin("magic-mail").service("account-manager");
           await accountMgr.resetCounters("hourly");
-          strapi2.log.info("[magic-mail] ✅ Hourly counters reset");
+          strapi2.log.info("[magic-mail] [RESET] Hourly counters reset");
         } catch (err) {
           console.error("[magic-mail] Hourly reset error:", err.message);
         }
@@ -101,7 +101,7 @@ function requireBootstrap() {
           }
           const accountMgr = strapi2.plugin("magic-mail").service("account-manager");
           await accountMgr.resetCounters("daily");
-          strapi2.log.info("[magic-mail] ✅ Daily counters reset");
+          strapi2.log.info("[magic-mail] [RESET] Daily counters reset");
           const dailyResetInterval = setInterval(async () => {
             try {
               if (!strapi2 || !strapi2.plugin) {
@@ -110,7 +110,7 @@ function requireBootstrap() {
               }
               const accountMgr2 = strapi2.plugin("magic-mail").service("account-manager");
               await accountMgr2.resetCounters("daily");
-              strapi2.log.info("[magic-mail] ✅ Daily counters reset");
+              strapi2.log.info("[magic-mail] [RESET] Daily counters reset");
             } catch (err) {
               console.error("[magic-mail] Daily reset error:", err.message);
             }
@@ -120,10 +120,10 @@ function requireBootstrap() {
           console.error("[magic-mail] Initial daily reset error:", err.message);
         }
       }, msUntilMidnight);
-      strapi2.log.info("[magic-mail] ✅ Counter reset schedules initialized");
-      strapi2.log.info("[magic-mail] ✅ Bootstrap complete");
+      strapi2.log.info("[magic-mail] [SUCCESS] Counter reset schedules initialized");
+      strapi2.log.info("[magic-mail] [SUCCESS] Bootstrap complete");
     } catch (err) {
-      strapi2.log.error("[magic-mail] ❌ Bootstrap error:", err);
+      strapi2.log.error("[magic-mail] [ERROR] Bootstrap error:", err);
     }
   };
   return bootstrap;
@@ -358,7 +358,7 @@ function requireAccounts() {
           ctx.throw(403, `Provider "${accountData.provider}" requires a Premium license or higher. Please upgrade your license.`);
           return;
         }
-        const currentAccounts = await strapi.entityService.count("plugin::magic-mail.email-account");
+        const currentAccounts = await strapi.documents("plugin::magic-mail.email-account").count();
         const maxAccounts = await licenseGuard2.getMaxAccounts();
         if (maxAccounts !== -1 && currentAccounts >= maxAccounts) {
           ctx.throw(403, `Account limit reached (${maxAccounts}). Upgrade your license to add more accounts.`);
@@ -439,9 +439,9 @@ function requireAccounts() {
           ctx.throw(400, "testEmail is required");
         }
         strapi.log.info("[magic-mail] 🧪 Testing Strapi Email Service integration...");
-        strapi.log.info('[magic-mail] 📧 Calling strapi.plugin("email").service("email").send()');
+        strapi.log.info('[magic-mail] [EMAIL] Calling strapi.plugin("email").service("email").send()');
         if (accountName) {
-          strapi.log.info(`[magic-mail] 🎯 Forcing specific account: ${accountName}`);
+          strapi.log.info(`[magic-mail] [FORCE] Forcing specific account: ${accountName}`);
         }
         const result = await strapi.plugin("email").service("email").send({
           to: testEmail,
@@ -468,6 +468,15 @@ function requireAccounts() {
                 <li>Statistics tracking</li>
               </ul>
             </div>
+            <div style="background: #DCFCE7; border: 1px solid #22C55E; border-radius: 8px; padding: 15px; margin: 20px 0;">
+              <h3 style="margin-top: 0; color: #15803D;">Security Features Active</h3>
+              <ul style="margin: 10px 0; padding-left: 20px;">
+                <li>TLS/SSL Encryption enforced</li>
+                <li>Email content validated</li>
+                <li>Proper headers included</li>
+                <li>Message-ID generated</li>
+              </ul>
+            </div>
             <p style="color: #6B7280; font-size: 14px; margin-top: 30px;">
               Sent at: ${(/* @__PURE__ */ new Date()).toLocaleString()}<br>
               Via: MagicMail Email Router
@@ -478,7 +487,7 @@ function requireAccounts() {
           accountName: accountName || null
           // Force specific account if provided
         });
-        strapi.log.info("[magic-mail] ✅ Strapi Email Service test completed");
+        strapi.log.info("[magic-mail] [SUCCESS] Strapi Email Service test completed");
         ctx.body = {
           success: true,
           message: "Email sent via Strapi Email Service (intercepted by MagicMail)",
@@ -490,7 +499,7 @@ function requireAccounts() {
           }
         };
       } catch (err) {
-        strapi.log.error("[magic-mail] ❌ Strapi Email Service test failed:", err);
+        strapi.log.error("[magic-mail] [ERROR] Strapi Email Service test failed:", err);
         ctx.body = {
           success: false,
           message: "Failed to send test email",
@@ -567,7 +576,7 @@ function requireOauth$1() {
             </style>
           </head>
           <body>
-            <div class="error">❌ OAuth Authorization Failed</div>
+            <div class="error">[ERROR] OAuth Authorization Failed</div>
             <p>Error: ${error}</p>
             <p>You can close this window and try again.</p>
             <script>
@@ -601,7 +610,7 @@ function requireOauth$1() {
           </style>
         </head>
         <body>
-          <div class="success">✅</div>
+          <div class="success">[SUCCESS]</div>
           <div class="message">Gmail OAuth Authorized!</div>
           <div class="note">Closing window...</div>
           <script>
@@ -676,7 +685,7 @@ function requireOauth$1() {
             </style>
           </head>
           <body>
-            <div class="error">❌ OAuth Authorization Failed</div>
+            <div class="error">[ERROR] OAuth Authorization Failed</div>
             <p>Error: ${error}</p>
             <p>You can close this window and try again.</p>
             <script>
@@ -710,7 +719,7 @@ function requireOauth$1() {
           </style>
         </head>
         <body>
-          <div class="success">✅</div>
+          <div class="success">[SUCCESS]</div>
           <div class="message">Microsoft OAuth Authorized!</div>
           <div class="note">Closing window...</div>
           <script>
@@ -781,7 +790,7 @@ function requireOauth$1() {
             </style>
           </head>
           <body>
-            <div class="error">❌ OAuth Authorization Failed</div>
+            <div class="error">[ERROR] OAuth Authorization Failed</div>
             <p>Error: ${error}</p>
             <p>You can close this window and try again.</p>
             <script>
@@ -815,7 +824,7 @@ function requireOauth$1() {
           </style>
         </head>
         <body>
-          <div class="success">✅</div>
+          <div class="success">[SUCCESS]</div>
           <div class="message">Yahoo Mail OAuth Authorized!</div>
           <div class="note">Closing window...</div>
           <script>
@@ -865,7 +874,7 @@ function requireOauth$1() {
           ctx.throw(403, `OAuth provider "${provider}" requires a Premium license or higher. Please upgrade your license.`);
           return;
         }
-        const currentAccounts = await strapi.entityService.count("plugin::magic-mail.email-account");
+        const currentAccounts = await strapi.documents("plugin::magic-mail.email-account").count();
         const maxAccounts = await licenseGuard2.getMaxAccounts();
         if (maxAccounts !== -1 && currentAccounts >= maxAccounts) {
           ctx.throw(403, `Account limit reached (${maxAccounts}). Upgrade your license to add more accounts.`);
@@ -920,7 +929,7 @@ function requireOauth$1() {
           accountDetails.config
           // contains clientId and clientSecret
         );
-        strapi.log.info("[magic-mail] ✅ OAuth account created successfully");
+        strapi.log.info("[magic-mail] [SUCCESS] OAuth account created successfully");
         ctx.body = {
           success: true,
           data: account,
@@ -940,14 +949,15 @@ var hasRequiredRoutingRules;
 function requireRoutingRules() {
   if (hasRequiredRoutingRules) return routingRules;
   hasRequiredRoutingRules = 1;
+  const ROUTING_RULE_UID = "plugin::magic-mail.routing-rule";
   routingRules = {
     /**
      * Get all routing rules
      */
     async getAll(ctx) {
       try {
-        const rules = await strapi.entityService.findMany("plugin::magic-mail.routing-rule", {
-          sort: { priority: "desc" }
+        const rules = await strapi.documents(ROUTING_RULE_UID).findMany({
+          sort: [{ priority: "desc" }]
         });
         ctx.body = {
           data: rules,
@@ -964,7 +974,9 @@ function requireRoutingRules() {
     async getOne(ctx) {
       try {
         const { ruleId } = ctx.params;
-        const rule = await strapi.entityService.findOne("plugin::magic-mail.routing-rule", ruleId);
+        const rule = await strapi.documents(ROUTING_RULE_UID).findOne({
+          documentId: ruleId
+        });
         if (!rule) {
           ctx.throw(404, "Routing rule not found");
         }
@@ -982,20 +994,20 @@ function requireRoutingRules() {
     async create(ctx) {
       try {
         const licenseGuard2 = strapi.plugin("magic-mail").service("license-guard");
-        const currentRules = await strapi.entityService.count("plugin::magic-mail.routing-rule");
+        const currentRules = await strapi.documents(ROUTING_RULE_UID).count();
         const maxRules = await licenseGuard2.getMaxRoutingRules();
         if (maxRules !== -1 && currentRules >= maxRules) {
           ctx.throw(403, `Routing rule limit reached (${maxRules}). Upgrade to Advanced license for unlimited rules.`);
           return;
         }
-        const rule = await strapi.entityService.create("plugin::magic-mail.routing-rule", {
+        const rule = await strapi.documents(ROUTING_RULE_UID).create({
           data: ctx.request.body
         });
         ctx.body = {
           data: rule,
           message: "Routing rule created successfully"
         };
-        strapi.log.info(`[magic-mail] ✅ Routing rule created: ${rule.name}`);
+        strapi.log.info(`[magic-mail] [SUCCESS] Routing rule created: ${rule.name}`);
       } catch (err) {
         strapi.log.error("[magic-mail] Error creating routing rule:", err);
         ctx.throw(err.status || 500, err.message || "Error creating routing rule");
@@ -1007,14 +1019,15 @@ function requireRoutingRules() {
     async update(ctx) {
       try {
         const { ruleId } = ctx.params;
-        const rule = await strapi.entityService.update("plugin::magic-mail.routing-rule", ruleId, {
+        const rule = await strapi.documents(ROUTING_RULE_UID).update({
+          documentId: ruleId,
           data: ctx.request.body
         });
         ctx.body = {
           data: rule,
           message: "Routing rule updated successfully"
         };
-        strapi.log.info(`[magic-mail] ✅ Routing rule updated: ${rule.name}`);
+        strapi.log.info(`[magic-mail] [SUCCESS] Routing rule updated: ${rule.name}`);
       } catch (err) {
         strapi.log.error("[magic-mail] Error updating routing rule:", err);
         ctx.throw(500, err.message || "Error updating routing rule");
@@ -1026,7 +1039,9 @@ function requireRoutingRules() {
     async delete(ctx) {
       try {
         const { ruleId } = ctx.params;
-        await strapi.entityService.delete("plugin::magic-mail.routing-rule", ruleId);
+        await strapi.documents(ROUTING_RULE_UID).delete({
+          documentId: ruleId
+        });
         ctx.body = {
           message: "Routing rule deleted successfully"
         };
@@ -1182,7 +1197,7 @@ function requireFeatures() {
      */
     hasFeature(licenseData, featureName) {
       if (!licenseData) {
-        console.log(`[features.js] ⚠️  No license data → using FREE tier`);
+        console.log(`[features.js] [WARNING]  No license data → using FREE tier`);
         return this.free.features.includes(featureName);
       }
       let isEnterprise = false;
@@ -1208,19 +1223,19 @@ function requireFeatures() {
         isPremium = true;
       }
       if (isEnterprise && this.enterprise.features.includes(featureName)) {
-        console.log(`[features.js] ✅ ENTERPRISE tier has feature "${featureName}"`);
+        console.log(`[features.js] [SUCCESS] ENTERPRISE tier has feature "${featureName}"`);
         return true;
       }
       if (isAdvanced && this.advanced.features.includes(featureName)) {
-        console.log(`[features.js] ✅ ADVANCED tier has feature "${featureName}"`);
+        console.log(`[features.js] [SUCCESS] ADVANCED tier has feature "${featureName}"`);
         return true;
       }
       if (isPremium && this.premium.features.includes(featureName)) {
-        console.log(`[features.js] ✅ PREMIUM tier has feature "${featureName}"`);
+        console.log(`[features.js] [SUCCESS] PREMIUM tier has feature "${featureName}"`);
         return true;
       }
       const inFree = this.free.features.includes(featureName);
-      console.log(`[features.js] ${inFree ? "✅" : "❌"} FREE tier check for "${featureName}": ${inFree}`);
+      console.log(`[features.js] ${inFree ? "[SUCCESS]" : "[ERROR]"} FREE tier check for "${featureName}": ${inFree}`);
       return inFree;
     },
     /**
@@ -1378,7 +1393,7 @@ function requireLicense() {
         const licenseGuard2 = strapi2.plugin("magic-mail").service("license-guard");
         const verification = await licenseGuard2.verifyLicense(trimmedKey);
         if (!verification.valid) {
-          strapi2.log.warn(`[magic-mail] ⚠️  Invalid license key attempted: ${trimmedKey.substring(0, 8)}...`);
+          strapi2.log.warn(`[magic-mail] [WARNING]  Invalid license key attempted: ${trimmedKey.substring(0, 8)}...`);
           return ctx.badRequest("Invalid or expired license key");
         }
         const license2 = await licenseGuard2.getLicenseByKey(trimmedKey);
@@ -1386,7 +1401,7 @@ function requireLicense() {
           return ctx.badRequest("License not found");
         }
         if (license2.email.toLowerCase() !== trimmedEmail) {
-          strapi2.log.warn(`[magic-mail] ⚠️  Email mismatch for license key`);
+          strapi2.log.warn(`[magic-mail] [WARNING]  Email mismatch for license key`);
           return ctx.badRequest("Email address does not match this license key");
         }
         await licenseGuard2.storeLicenseKey(trimmedKey);
@@ -1396,7 +1411,7 @@ function requireLicense() {
           pingInterval,
           data: verification.data
         };
-        strapi2.log.info(`[magic-mail] ✅ License validated and stored`);
+        strapi2.log.info(`[magic-mail] [SUCCESS] License validated and stored`);
         return ctx.send({
           success: true,
           message: "License activated successfully",
@@ -1440,9 +1455,11 @@ function requireLicense() {
         const maxAccounts = await licenseGuard2.getMaxAccounts();
         const maxRules = await licenseGuard2.getMaxRoutingRules();
         const maxTemplates = await licenseGuard2.getMaxEmailTemplates();
-        const currentAccounts = await strapi2.entityService.count("plugin::magic-mail.email-account");
-        const currentRules = await strapi2.entityService.count("plugin::magic-mail.routing-rule");
-        const currentTemplates = await strapi2.entityService.count("plugin::magic-mail.email-template");
+        const [currentAccounts, currentRules, currentTemplates] = await Promise.all([
+          strapi2.documents("plugin::magic-mail.email-account").count(),
+          strapi2.documents("plugin::magic-mail.routing-rule").count(),
+          strapi2.documents("plugin::magic-mail.email-template").count()
+        ]);
         let tier = "free";
         if (license2?.featureEnterprise === true || license2?.features?.enterprise === true) tier = "enterprise";
         else if (license2?.featureAdvanced === true || license2?.features?.advanced === true) tier = "advanced";
@@ -1851,6 +1868,9 @@ var hasRequiredAnalytics$1;
 function requireAnalytics$1() {
   if (hasRequiredAnalytics$1) return analytics$1;
   hasRequiredAnalytics$1 = 1;
+  const EMAIL_LOG_UID = "plugin::magic-mail.email-log";
+  const EMAIL_EVENT_UID = "plugin::magic-mail.email-event";
+  const EMAIL_ACCOUNT_UID = "plugin::magic-mail.email-account";
   analytics$1 = ({ strapi: strapi2 }) => ({
     /**
      * Tracking pixel endpoint
@@ -1890,7 +1910,8 @@ function requireAnalytics$1() {
     async getStats(ctx) {
       try {
         const filters = {
-          userId: ctx.query.userId ? parseInt(ctx.query.userId) : null,
+          // userId is documentId (string) in Strapi v5, NOT parseInt!
+          userId: ctx.query.userId || null,
           templateId: ctx.query.templateId ? parseInt(ctx.query.templateId) : null,
           accountId: ctx.query.accountId ? parseInt(ctx.query.accountId) : null,
           dateFrom: ctx.query.dateFrom || null,
@@ -1913,7 +1934,8 @@ function requireAnalytics$1() {
     async getEmailLogs(ctx) {
       try {
         const filters = {
-          userId: ctx.query.userId ? parseInt(ctx.query.userId) : null,
+          // userId is documentId (string) in Strapi v5, NOT parseInt!
+          userId: ctx.query.userId || null,
           templateId: ctx.query.templateId ? parseInt(ctx.query.templateId) : null,
           search: ctx.query.search || null
         };
@@ -1953,11 +1975,12 @@ function requireAnalytics$1() {
     /**
      * Get user email activity
      * GET /magic-mail/analytics/users/:userId
+     * Note: userId is documentId (string) in Strapi v5
      */
     async getUserActivity(ctx) {
       try {
         const { userId } = ctx.params;
-        const activity = await strapi2.plugin("magic-mail").service("analytics").getUserActivity(parseInt(userId));
+        const activity = await strapi2.plugin("magic-mail").service("analytics").getUserActivity(userId);
         return ctx.send({
           success: true,
           data: activity
@@ -1972,19 +1995,19 @@ function requireAnalytics$1() {
      */
     async debug(ctx) {
       try {
-        strapi2.log.info("[magic-mail] 🔍 Running Analytics Debug...");
-        const emailLogs = await strapi2.db.query("plugin::magic-mail.email-log").findMany({
+        strapi2.log.info("[magic-mail] [CHECK] Running Analytics Debug...");
+        const emailLogs = await strapi2.documents(EMAIL_LOG_UID).findMany({
           limit: 10,
-          orderBy: { sentAt: "DESC" }
+          sort: [{ sentAt: "desc" }]
         });
-        const emailEvents = await strapi2.db.query("plugin::magic-mail.email-event").findMany({
+        const emailEvents = await strapi2.documents(EMAIL_EVENT_UID).findMany({
           limit: 20,
-          orderBy: { timestamp: "DESC" },
+          sort: [{ timestamp: "desc" }],
           populate: ["emailLog"]
         });
         const analyticsService = strapi2.plugin("magic-mail").service("analytics");
         const stats = await analyticsService.getStats();
-        const accounts2 = await strapi2.entityService.findMany("plugin::magic-mail.email-account", {
+        const accounts2 = await strapi2.documents(EMAIL_ACCOUNT_UID).findMany({
           filters: { isActive: true },
           fields: ["id", "name", "provider", "fromEmail", "emailsSentToday", "totalEmailsSent"]
         });
@@ -2048,19 +2071,20 @@ function requireAnalytics$1() {
     async deleteEmailLog(ctx) {
       try {
         const { emailId } = ctx.params;
-        const emailLog = await strapi2.db.query("plugin::magic-mail.email-log").findOne({
-          where: { emailId }
+        const emailLog = await strapi2.documents(EMAIL_LOG_UID).findFirst({
+          filters: { emailId }
         });
         if (!emailLog) {
           return ctx.notFound("Email log not found");
         }
-        await strapi2.db.query("plugin::magic-mail.email-event").deleteMany({
-          where: { emailLog: emailLog.id }
-        });
-        await strapi2.db.query("plugin::magic-mail.email-log").delete({
-          where: { id: emailLog.id }
+        const events = await strapi2.documents(EMAIL_EVENT_UID).findMany({
+          filters: { emailLog: { documentId: emailLog.documentId } }
         });
-        strapi2.log.info(`[magic-mail] 🗑️  Deleted email log: ${emailId}`);
+        for (const event of events) {
+          await strapi2.documents(EMAIL_EVENT_UID).delete({ documentId: event.documentId });
+        }
+        await strapi2.documents(EMAIL_LOG_UID).delete({ documentId: emailLog.documentId });
+        strapi2.log.info(`[magic-mail] [DELETE]  Deleted email log: ${emailId}`);
         return ctx.send({
           success: true,
           message: "Email log deleted successfully"
@@ -2077,33 +2101,36 @@ function requireAnalytics$1() {
     async clearAllEmailLogs(ctx) {
       try {
         const { olderThan } = ctx.query;
-        const where = {};
+        const filters = {};
         if (olderThan) {
-          where.sentAt = { $lt: new Date(olderThan) };
+          filters.sentAt = { $lt: new Date(olderThan) };
         }
-        const emailLogs = await strapi2.db.query("plugin::magic-mail.email-log").findMany({
-          where,
-          select: ["id"]
+        const emailLogs = await strapi2.documents(EMAIL_LOG_UID).findMany({
+          filters,
+          fields: ["id", "documentId"],
+          limit: 1e5
         });
-        const emailLogIds = emailLogs.map((log) => log.id);
-        if (emailLogIds.length === 0) {
+        if (emailLogs.length === 0) {
           return ctx.send({
             success: true,
             message: "No email logs to delete",
             deletedCount: 0
           });
         }
-        await strapi2.db.query("plugin::magic-mail.email-event").deleteMany({
-          where: { emailLog: { $in: emailLogIds } }
-        });
-        await strapi2.db.query("plugin::magic-mail.email-log").deleteMany({
-          where: { id: { $in: emailLogIds } }
-        });
-        strapi2.log.info(`[magic-mail] 🗑️  Cleared ${emailLogIds.length} email logs`);
+        for (const log of emailLogs) {
+          const events = await strapi2.documents(EMAIL_EVENT_UID).findMany({
+            filters: { emailLog: { documentId: log.documentId } }
+          });
+          for (const event of events) {
+            await strapi2.documents(EMAIL_EVENT_UID).delete({ documentId: event.documentId });
+          }
+          await strapi2.documents(EMAIL_LOG_UID).delete({ documentId: log.documentId });
+        }
+        strapi2.log.info(`[magic-mail] [DELETE]  Cleared ${emailLogs.length} email logs`);
         return ctx.send({
           success: true,
-          message: `Successfully deleted ${emailLogIds.length} email log(s)`,
-          deletedCount: emailLogIds.length
+          message: `Successfully deleted ${emailLogs.length} email log(s)`,
+          deletedCount: emailLogs.length
         });
       } catch (error) {
         strapi2.log.error("[magic-mail] Error clearing email logs:", error);
@@ -2118,18 +2145,16 @@ var hasRequiredTest;
 function requireTest() {
   if (hasRequiredTest) return test;
   hasRequiredTest = 1;
+  const EMAIL_TEMPLATE_UID = "plugin::magic-mail.email-template";
+  const EMAIL_TEMPLATE_VERSION_UID = "plugin::magic-mail.email-template-version";
   test = {
     /**
      * Test Template-Version Relations
-     * 
-     * Tests beide Richtungen:
-     * 1. Version → Template beim Erstellen
-     * 2. Template → Version nachträglich via connect
      */
     async testRelations(ctx) {
       try {
         console.log("\n" + "=".repeat(60));
-        console.log("🧪 TEST: Template ↔ Version Relations");
+        console.log("🧪 TEST: Template ↔ Version Relations (Document Service API)");
         console.log("=".repeat(60));
         let test1Success = false;
         let test1ReverseSuccess = false;
@@ -2139,257 +2164,192 @@ function requireTest() {
         let test3a_hasTemplate = false;
         let test3b_twoVersions = false;
         let test3b_allHaveTemplate = false;
-        console.log("\n📝 TEST 1: Version → Template Verbindung\n");
-        const testTemplate = await strapi.entityService.create(
-          "plugin::magic-mail.email-template",
-          {
-            data: {
-              templateReferenceId: Math.floor(Math.random() * 1e6),
-              name: "Test Template Relations",
-              subject: "Test Subject",
-              bodyHtml: "<p>Test HTML</p>",
-              bodyText: "Test Text",
-              category: "custom",
-              isActive: true
-            }
-          }
-        );
-        console.log(`✅ Template erstellt: ID ${testTemplate.id}`);
-        const version1 = await strapi.entityService.create(
-          "plugin::magic-mail.email-template-version",
-          {
-            data: {
-              template: testTemplate.id,
-              // 👈 Direkte Verbindung beim Erstellen
-              versionNumber: 1,
-              name: "Version 1 von Test",
-              subject: "Test Subject V1",
-              bodyHtml: "<p>Version 1 HTML</p>",
-              bodyText: "Version 1 Text"
-            }
+        console.log("\n[TEST] TEST 1: Version → Template Verbindung\n");
+        const testTemplate = await strapi.documents(EMAIL_TEMPLATE_UID).create({
+          data: {
+            templateReferenceId: Math.floor(Math.random() * 1e6),
+            name: "Test Template Relations",
+            subject: "Test Subject",
+            bodyHtml: "<p>Test HTML</p>",
+            bodyText: "Test Text",
+            category: "custom",
+            isActive: true
           }
-        );
-        console.log(`✅ Version erstellt: ID ${version1.id}, versionNumber: ${version1.versionNumber}`);
-        const versionCheck = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template-version",
-          version1.id,
-          {
-            populate: ["template"]
+        });
+        console.log(`[SUCCESS] Template erstellt: documentId ${testTemplate.documentId}`);
+        const version1 = await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).create({
+          data: {
+            template: testTemplate.documentId,
+            versionNumber: 1,
+            name: "Version 1 von Test",
+            subject: "Test Subject V1",
+            bodyHtml: "<p>Version 1 HTML</p>",
+            bodyText: "Version 1 Text"
           }
-        );
-        console.log("\n🔍 Prüfung Version → Template:");
+        });
+        console.log(`[SUCCESS] Version erstellt: documentId ${version1.documentId}, versionNumber: ${version1.versionNumber}`);
+        const versionCheck = await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+          documentId: version1.documentId,
+          populate: ["template"]
+        });
+        console.log("\n[CHECK] Prüfung Version → Template:");
         test1Success = !!versionCheck.template;
         if (test1Success) {
-          console.log(`   ✅ SUCCESS: Version ${versionCheck.id} → Template ${versionCheck.template.id}`);
-          console.log(`   📋 Template: "${versionCheck.template.name}"`);
+          console.log(`   [SUCCESS] SUCCESS: Version → Template ${versionCheck.template.documentId}`);
         } else {
-          console.log(`   ❌ FEHLER: Version ${versionCheck.id} hat KEINE Template-Verbindung!`);
+          console.log(`   [ERROR] FEHLER: Version hat KEINE Template-Verbindung!`);
         }
-        const templateCheck1 = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template",
-          testTemplate.id,
-          {
-            populate: ["versions"]
-          }
-        );
-        console.log("\n🔍 Prüfung Template → Versions:");
+        const templateCheck1 = await strapi.documents(EMAIL_TEMPLATE_UID).findOne({
+          documentId: testTemplate.documentId,
+          populate: ["versions"]
+        });
+        console.log("\n[CHECK] Prüfung Template → Versions:");
         test1ReverseSuccess = templateCheck1.versions && templateCheck1.versions.length > 0;
         if (test1ReverseSuccess) {
-          console.log(`   ✅ SUCCESS: Template ${templateCheck1.id} hat ${templateCheck1.versions.length} Version(en)`);
-          templateCheck1.versions.forEach((v) => {
-            console.log(`   📋 Version ${v.id}: versionNumber ${v.versionNumber}`);
-          });
+          console.log(`   [SUCCESS] SUCCESS: Template hat ${templateCheck1.versions.length} Version(en)`);
         } else {
-          console.log(`   ❌ FEHLER: Template ${templateCheck1.id} hat KEINE Versionen!`);
-        }
-        console.log("\n\n📝 TEST 2: Nachträgliche Verbindung (Template Update)\n");
-        const version2 = await strapi.entityService.create(
-          "plugin::magic-mail.email-template-version",
-          {
-            data: {
-              versionNumber: 2,
-              name: "Version 2 ohne Template",
-              subject: "Test Subject V2",
-              bodyHtml: "<p>Version 2 HTML</p>",
-              bodyText: "Version 2 Text"
-            }
-          }
-        );
-        console.log(`✅ Version 2 erstellt: ID ${version2.id} (ohne Template)`);
-        await strapi.entityService.update(
-          "plugin::magic-mail.email-template",
-          testTemplate.id,
-          {
-            data: {
-              versions: {
-                connect: [version2.id]
-                // 👈 Nachträgliche Verbindung
-              }
-            }
+          console.log(`   [ERROR] FEHLER: Template hat KEINE Versionen!`);
+        }
+        console.log("\n\n[TEST] TEST 2: Nachträgliche Verbindung\n");
+        const version2 = await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).create({
+          data: {
+            versionNumber: 2,
+            name: "Version 2 ohne Template",
+            subject: "Test Subject V2",
+            bodyHtml: "<p>Version 2 HTML</p>",
+            bodyText: "Version 2 Text"
           }
-        );
-        console.log(`✅ Template updated: Version ${version2.id} verbunden`);
-        const templateCheck2 = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template",
-          testTemplate.id,
-          {
-            populate: ["versions"]
+        });
+        console.log(`[SUCCESS] Version 2 erstellt: documentId ${version2.documentId} (ohne Template)`);
+        await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).update({
+          documentId: version2.documentId,
+          data: {
+            template: testTemplate.documentId
           }
-        );
-        console.log("\n🔍 Prüfung nach Template Update:");
+        });
+        console.log(`[SUCCESS] Version 2 mit Template verbunden`);
+        const templateCheck2 = await strapi.documents(EMAIL_TEMPLATE_UID).findOne({
+          documentId: testTemplate.documentId,
+          populate: ["versions"]
+        });
+        console.log("\n[CHECK] Prüfung nach Update:");
         test2Success = templateCheck2.versions && templateCheck2.versions.length >= 2;
         if (test2Success) {
-          console.log(`   ✅ SUCCESS: Template hat jetzt ${templateCheck2.versions.length} Versionen`);
-          templateCheck2.versions.forEach((v) => {
-            console.log(`   📋 Version ${v.id}: versionNumber ${v.versionNumber}, "${v.name}"`);
-          });
+          console.log(`   [SUCCESS] SUCCESS: Template hat jetzt ${templateCheck2.versions.length} Versionen`);
         } else {
-          console.log(`   ❌ FEHLER: Template hat nur ${templateCheck2.versions?.length || 0} Version(en)!`);
+          console.log(`   [ERROR] FEHLER: Template hat nur ${templateCheck2.versions?.length || 0} Version(en)!`);
         }
-        const version2Check = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template-version",
-          version2.id,
-          {
-            populate: ["template"]
-          }
-        );
-        console.log("\n🔍 Prüfung Version 2 → Template:");
+        const version2Check = await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+          documentId: version2.documentId,
+          populate: ["template"]
+        });
         test2ReverseSuccess = !!version2Check.template;
         if (test2ReverseSuccess) {
-          console.log(`   ✅ SUCCESS: Version ${version2Check.id} → Template ${version2Check.template.id}`);
-          console.log(`   📋 Template: "${version2Check.template.name}"`);
+          console.log(`   [SUCCESS] SUCCESS: Version 2 → Template verbunden`);
         } else {
-          console.log(`   ❌ FEHLER: Version ${version2Check.id} hat KEINE Template-Verbindung!`);
-        }
-        console.log("\n\n📝 TEST 3: Template Update (Auto-Versionierung)\n");
-        const autoTemplate = await strapi.entityService.create(
-          "plugin::magic-mail.email-template",
-          {
-            data: {
-              templateReferenceId: Math.floor(Math.random() * 1e6),
-              name: "Auto Version Test",
-              subject: "Original Subject",
-              bodyHtml: "<p>Original HTML</p>",
-              bodyText: "Original Text",
-              category: "custom",
-              isActive: true
-            }
+          console.log(`   [ERROR] FEHLER: Version 2 hat KEINE Template-Verbindung!`);
+        }
+        console.log("\n\n[TEST] TEST 3: Template Update (Auto-Versionierung)\n");
+        const autoTemplate = await strapi.documents(EMAIL_TEMPLATE_UID).create({
+          data: {
+            templateReferenceId: Math.floor(Math.random() * 1e6),
+            name: "Auto Version Test",
+            subject: "Original Subject",
+            bodyHtml: "<p>Original HTML</p>",
+            bodyText: "Original Text",
+            category: "custom",
+            isActive: true
           }
-        );
-        console.log(`✅ Template erstellt: ID ${autoTemplate.id}, name: "${autoTemplate.name}"`);
-        const beforeUpdate = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template",
-          autoTemplate.id,
-          { populate: ["versions"] }
-        );
-        console.log(`   📊 Versionen vor Update: ${beforeUpdate.versions?.length || 0}`);
-        console.log("\n🔄 Führe Template-Update aus...");
+        });
+        console.log(`[SUCCESS] Template erstellt: documentId ${autoTemplate.documentId}`);
         const emailDesignerService = strapi.plugin("magic-mail").service("email-designer");
-        await emailDesignerService.update(autoTemplate.id, {
+        await emailDesignerService.update(autoTemplate.documentId, {
           subject: "Updated Subject V1",
           bodyHtml: "<p>Updated HTML V1</p>",
           bodyText: "Updated Text V1"
         });
-        console.log("✅ Template updated");
-        const afterFirstUpdate = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template",
-          autoTemplate.id,
-          { populate: ["versions"] }
-        );
-        console.log("\n🔍 Prüfung nach 1. Update:");
+        console.log("[SUCCESS] Template updated");
+        const afterFirstUpdate = await strapi.documents(EMAIL_TEMPLATE_UID).findOne({
+          documentId: autoTemplate.documentId,
+          populate: ["versions"]
+        });
+        console.log("\n[CHECK] Prüfung nach 1. Update:");
         test3a_versionCreated = afterFirstUpdate.versions && afterFirstUpdate.versions.length === 1;
         if (test3a_versionCreated) {
-          console.log(`   ✅ SUCCESS: Automatisch 1 Version erstellt`);
-          const autoVersion1 = await strapi.entityService.findOne(
-            "plugin::magic-mail.email-template-version",
-            afterFirstUpdate.versions[0].id,
-            { populate: ["template"] }
-          );
+          console.log(`   [SUCCESS] SUCCESS: Automatisch 1 Version erstellt`);
+          const autoVersion1 = await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+            documentId: afterFirstUpdate.versions[0].documentId,
+            populate: ["template"]
+          });
           test3a_hasTemplate = !!autoVersion1.template;
           if (test3a_hasTemplate) {
-            console.log(`   ✅ SUCCESS: Version ${autoVersion1.id} hat Template-Verbindung (Template ID: ${autoVersion1.template.id})`);
-            console.log(`   📋 Version: versionNumber ${autoVersion1.versionNumber}, subject: "${autoVersion1.subject}"`);
+            console.log(`   [SUCCESS] SUCCESS: Version hat Template-Verbindung`);
           } else {
-            console.log(`   ❌ FEHLER: Version ${autoVersion1.id} hat KEINE Template-Verbindung!`);
+            console.log(`   [ERROR] FEHLER: Version hat KEINE Template-Verbindung!`);
           }
         } else {
-          console.log(`   ❌ FEHLER: Keine Version erstellt! Versionen: ${afterFirstUpdate.versions?.length || 0}`);
+          console.log(`   [ERROR] FEHLER: Keine Version erstellt!`);
         }
-        console.log("\n🔄 Führe 2. Template-Update aus...");
-        await emailDesignerService.update(autoTemplate.id, {
+        await emailDesignerService.update(autoTemplate.documentId, {
           subject: "Updated Subject V2",
           bodyHtml: "<p>Updated HTML V2</p>",
           bodyText: "Updated Text V2"
         });
-        console.log("✅ Template updated (2. Mal)");
-        const afterSecondUpdate = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template",
-          autoTemplate.id,
-          { populate: ["versions"] }
-        );
-        console.log("\n🔍 Prüfung nach 2. Update:");
+        const afterSecondUpdate = await strapi.documents(EMAIL_TEMPLATE_UID).findOne({
+          documentId: autoTemplate.documentId,
+          populate: ["versions"]
+        });
+        console.log("\n[CHECK] Prüfung nach 2. Update:");
         test3b_twoVersions = afterSecondUpdate.versions && afterSecondUpdate.versions.length === 2;
         if (test3b_twoVersions) {
-          console.log(`   ✅ SUCCESS: Jetzt 2 Versionen vorhanden`);
+          console.log(`   [SUCCESS] SUCCESS: Jetzt 2 Versionen vorhanden`);
           let allVersionsHaveTemplate = true;
           for (const version3 of afterSecondUpdate.versions) {
-            const fullVersion = await strapi.entityService.findOne(
-              "plugin::magic-mail.email-template-version",
-              version3.id,
-              { populate: ["template"] }
-            );
-            if (fullVersion.template) {
-              console.log(`   ✅ Version ${fullVersion.id} (v${fullVersion.versionNumber}): Template-Verbindung OK`);
-            } else {
-              console.log(`   ❌ Version ${fullVersion.id} (v${fullVersion.versionNumber}): KEINE Template-Verbindung!`);
+            const fullVersion = await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+              documentId: version3.documentId,
+              populate: ["template"]
+            });
+            if (!fullVersion.template) {
               allVersionsHaveTemplate = false;
             }
           }
           test3b_allHaveTemplate = allVersionsHaveTemplate;
           if (allVersionsHaveTemplate) {
-            console.log(`   ✅ SUCCESS: Alle Versionen haben Template-Verbindung!`);
+            console.log(`   [SUCCESS] SUCCESS: Alle Versionen haben Template-Verbindung!`);
+          } else {
+            console.log(`   [ERROR] FEHLER: Nicht alle Versionen haben Template-Verbindung!`);
           }
         } else {
-          console.log(`   ❌ FEHLER: Falsche Anzahl Versionen! Erwartet: 2, Gefunden: ${afterSecondUpdate.versions?.length || 0}`);
+          console.log(`   [ERROR] FEHLER: Falsche Anzahl Versionen!`);
         }
         console.log("\n🧹 Cleanup Test 3...");
         if (afterSecondUpdate.versions) {
           for (const version3 of afterSecondUpdate.versions) {
-            await strapi.entityService.delete("plugin::magic-mail.email-template-version", version3.id);
+            await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version3.documentId });
           }
         }
-        await strapi.entityService.delete("plugin::magic-mail.email-template", autoTemplate.id);
-        console.log("   ✅ Test 3 Daten gelöscht");
+        await strapi.documents(EMAIL_TEMPLATE_UID).delete({ documentId: autoTemplate.documentId });
+        console.log("   [SUCCESS] Test 3 Daten gelöscht");
         console.log("\n\n" + "=".repeat(60));
-        console.log("📊 ZUSAMMENFASSUNG");
+        console.log("[STATS] ZUSAMMENFASSUNG");
         console.log("=".repeat(60));
-        const finalTemplate = await strapi.entityService.findOne(
-          "plugin::magic-mail.email-template",
-          testTemplate.id,
-          {
-            populate: ["versions"]
-          }
-        );
+        const finalTemplate = await strapi.documents(EMAIL_TEMPLATE_UID).findOne({
+          documentId: testTemplate.documentId,
+          populate: ["versions"]
+        });
         console.log(`
-📋 Template: "${finalTemplate.name}" (ID: ${finalTemplate.id})`);
-        console.log(`   Anzahl Versionen im Template: ${finalTemplate.versions?.length || 0}`);
-        if (finalTemplate.versions && finalTemplate.versions.length > 0) {
-          finalTemplate.versions.forEach((v) => {
-            console.log(`   - Version ${v.id}: versionNumber ${v.versionNumber}`);
-          });
-        }
+[INFO] Template: "${finalTemplate.name}" (documentId: ${finalTemplate.documentId})`);
+        console.log(`   Anzahl Versionen: ${finalTemplate.versions?.length || 0}`);
         console.log("\n🧹 Aufräumen...");
-        await strapi.entityService.delete("plugin::magic-mail.email-template-version", version1.id);
-        console.log(`   ✅ Version ${version1.id} gelöscht`);
-        await strapi.entityService.delete("plugin::magic-mail.email-template-version", version2.id);
-        console.log(`   ✅ Version ${version2.id} gelöscht`);
-        await strapi.entityService.delete("plugin::magic-mail.email-template", testTemplate.id);
-        console.log(`   ✅ Template ${testTemplate.id} gelöscht`);
-        console.log("\n✅ Test abgeschlossen!\n");
+        await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version1.documentId });
+        await strapi.documents(EMAIL_TEMPLATE_VERSION_UID).delete({ documentId: version2.documentId });
+        await strapi.documents(EMAIL_TEMPLATE_UID).delete({ documentId: testTemplate.documentId });
+        console.log("   [SUCCESS] Alle Test-Daten gelöscht");
+        console.log("\n[SUCCESS] Test abgeschlossen!\n");
         const allSuccess = test1Success && test1ReverseSuccess && test2Success && test2ReverseSuccess && test3a_versionCreated && test3a_hasTemplate && test3b_twoVersions && test3b_allHaveTemplate;
         ctx.body = {
           success: allSuccess,
-          message: allSuccess ? "Alle Tests erfolgreich! ✅" : "Einige Tests fehlgeschlagen ❌",
+          message: allSuccess ? "Alle Tests erfolgreich! [SUCCESS]" : "Einige Tests fehlgeschlagen [ERROR]",
           tests: {
             test1_version_to_template: test1Success,
             test1_template_to_version: test1ReverseSuccess,
@@ -2399,15 +2359,10 @@ function requireTest() {
             test3_auto_version_has_template: test3a_hasTemplate,
             test3_two_auto_versions: test3b_twoVersions,
             test3_all_auto_versions_have_template: test3b_allHaveTemplate
-          },
-          template: {
-            id: testTemplate.id,
-            name: testTemplate.name,
-            versionsCount: finalTemplate.versions?.length || 0
           }
         };
       } catch (error) {
-        console.error("\n❌ FEHLER:", error.message);
+        console.error("\n[ERROR] FEHLER:", error.message);
         console.error(error.stack);
         ctx.throw(500, error);
       }
@@ -3001,7 +2956,7 @@ function requireEncryption() {
     if (envKey) {
       return crypto.createHash("sha256").update(envKey).digest();
     }
-    console.warn("[magic-mail] ⚠️  No MAGIC_MAIL_ENCRYPTION_KEY found. Using fallback.");
+    console.warn("[magic-mail] [WARNING]  No MAGIC_MAIL_ENCRYPTION_KEY found. Using fallback.");
     return crypto.createHash("sha256").update("magic-mail-default-key").digest();
   }
   function encryptCredentials(data) {
@@ -3080,12 +3035,17 @@ function requireEmailRouter() {
         // Template Reference ID
         templateData,
         // Data for template rendering
-        data
+        data,
         // Alias for templateData (for native Strapi compatibility)
+        skipLinkTracking = false
+        // Skip link rewriting for sensitive URLs (e.g., Magic Links)
       } = emailData;
       if (!templateData && data) {
         templateData = data;
       }
+      if (skipLinkTracking) {
+        strapi2.log.info(`[magic-mail] [SKIP-TRACK] skipLinkTracking=true received for email to: ${to}`);
+      }
       let renderedTemplate = null;
       if (templateId || emailData.templateReferenceId) {
         try {
@@ -3098,10 +3058,10 @@ function requireEmailRouter() {
           if (!resolvedTemplateReferenceId && templateId) {
             const numericTemplateId = Number(templateId);
             if (!Number.isNaN(numericTemplateId) && Number.isInteger(numericTemplateId)) {
-              strapi2.log.info(`[magic-mail] 🔍 Looking up template by ID: ${numericTemplateId}`);
+              strapi2.log.info(`[magic-mail] [CHECK] Looking up template by ID: ${numericTemplateId}`);
               templateRecord = await strapi2.plugin("magic-mail").service("email-designer").findOne(numericTemplateId);
               if (!templateRecord) {
-                strapi2.log.error(`[magic-mail] ❌ Template with ID ${numericTemplateId} not found in database`);
+                strapi2.log.error(`[magic-mail] [ERROR] Template with ID ${numericTemplateId} not found in database`);
                 throw new Error(`Template with ID ${numericTemplateId} not found`);
               }
               if (!templateRecord.templateReferenceId) {
@@ -3109,7 +3069,7 @@ function requireEmailRouter() {
               }
               resolvedTemplateReferenceId = String(templateRecord.templateReferenceId).trim();
               strapi2.log.info(
-                `[magic-mail] ✅ Found template: ID=${templateRecord.id}, referenceId="${resolvedTemplateReferenceId}", name="${templateRecord.name}"`
+                `[magic-mail] [SUCCESS] Found template: ID=${templateRecord.id}, referenceId="${resolvedTemplateReferenceId}", name="${templateRecord.name}"`
               );
             } else {
               resolvedTemplateReferenceId = String(templateId).trim();
@@ -3125,14 +3085,14 @@ function requireEmailRouter() {
           subject = subject || renderedTemplate.subject;
           type = type || renderedTemplate.category;
           strapi2.log.info(
-            `[magic-mail] 📧 Rendered template reference "${resolvedTemplateReferenceId}" (requested ID: ${templateId ?? "n/a"}): ${renderedTemplate.templateName}`
+            `[magic-mail] [EMAIL] Rendered template reference "${resolvedTemplateReferenceId}" (requested ID: ${templateId ?? "n/a"}): ${renderedTemplate.templateName}`
           );
           emailData.templateReferenceId = resolvedTemplateReferenceId;
           if (!emailData.templateName) {
             emailData.templateName = templateRecord?.name || renderedTemplate.templateName;
           }
         } catch (error) {
-          strapi2.log.error(`[magic-mail] ❌ Template rendering failed: ${error.message}`);
+          strapi2.log.error(`[magic-mail] [ERROR] Template rendering failed: ${error.message}`);
           throw new Error(`Template rendering failed: ${error.message}`);
         }
       }
@@ -3161,10 +3121,14 @@ function requireEmailRouter() {
           });
           recipientHash = analyticsService.generateRecipientHash(emailLog.emailId, to);
           html = analyticsService.injectTrackingPixel(html, emailLog.emailId, recipientHash);
-          html = await analyticsService.rewriteLinksForTracking(html, emailLog.emailId, recipientHash);
-          strapi2.log.info(`[magic-mail] 📊 Tracking enabled for email: ${emailLog.emailId}`);
+          if (!skipLinkTracking) {
+            html = await analyticsService.rewriteLinksForTracking(html, emailLog.emailId, recipientHash);
+            strapi2.log.info(`[magic-mail] [STATS] Full tracking enabled for email: ${emailLog.emailId}`);
+          } else {
+            strapi2.log.info(`[magic-mail] [STATS] Open tracking enabled, link tracking DISABLED for email: ${emailLog.emailId}`);
+          }
         } catch (error) {
-          strapi2.log.error(`[magic-mail] ⚠️  Tracking setup failed (continuing without tracking):`, error.message);
+          strapi2.log.error(`[magic-mail] [WARNING]  Tracking setup failed (continuing without tracking):`, error.message);
         }
       }
       emailData.html = html;
@@ -3175,7 +3139,7 @@ function requireEmailRouter() {
         if (priority === "high") {
           const hasFeature = await licenseGuard2.hasFeature("priority-headers");
           if (!hasFeature) {
-            strapi2.log.warn("[magic-mail] ⚠️  High priority emails require Advanced license - using normal priority");
+            strapi2.log.warn("[magic-mail] [WARNING]  High priority emails require Advanced license - using normal priority");
             emailData.priority = "normal";
           }
         }
@@ -3199,8 +3163,8 @@ function requireEmailRouter() {
         const result = await this.sendViaAccount(account, emailData);
         if (emailLog) {
           try {
-            await strapi2.db.query("plugin::magic-mail.email-log").update({
-              where: { id: emailLog.id },
+            await strapi2.documents("plugin::magic-mail.email-log").update({
+              documentId: emailLog.documentId,
               data: {
                 accountId: account.id,
                 accountName: account.name,
@@ -3211,15 +3175,15 @@ function requireEmailRouter() {
             strapi2.log.error("[magic-mail] Failed to update email log:", error.message);
           }
         }
-        await this.updateAccountStats(account.id);
-        strapi2.log.info(`[magic-mail] ✅ Email sent to ${to} via ${account.name}`);
+        await this.updateAccountStats(account.documentId);
+        strapi2.log.info(`[magic-mail] [SUCCESS] Email sent to ${to} via ${account.name}`);
         return {
           success: true,
           accountUsed: account.name,
           messageId: result.messageId
         };
       } catch (error) {
-        strapi2.log.error("[magic-mail] ❌ Email send failed:", error);
+        strapi2.log.error("[magic-mail] [ERROR] Email send failed:", error);
         throw error;
       }
     },
@@ -3227,21 +3191,21 @@ function requireEmailRouter() {
      * Select best account based on rules
      */
     async selectAccount(type, priority, excludeIds = [], emailData = {}) {
-      const accounts2 = await strapi2.entityService.findMany("plugin::magic-mail.email-account", {
+      const accounts2 = await strapi2.documents("plugin::magic-mail.email-account").findMany({
         filters: {
           isActive: true,
           id: { $notIn: excludeIds }
         },
-        sort: { priority: "desc" }
+        sort: [{ priority: "desc" }]
       });
       if (!accounts2 || accounts2.length === 0) {
         return null;
       }
-      const allRules = await strapi2.entityService.findMany("plugin::magic-mail.routing-rule", {
+      const allRules = await strapi2.documents("plugin::magic-mail.routing-rule").findMany({
         filters: {
           isActive: true
         },
-        sort: { priority: "desc" }
+        sort: [{ priority: "desc" }]
       });
       for (const rule of allRules) {
         let matches = false;
@@ -3265,13 +3229,13 @@ function requireEmailRouter() {
         if (matches) {
           const account = accounts2.find((a) => a.name === rule.accountName);
           if (account) {
-            strapi2.log.info(`[magic-mail] 🎯 Routing rule matched: ${rule.name} → ${account.name}`);
+            strapi2.log.info(`[magic-mail] [ROUTE] Routing rule matched: ${rule.name} -> ${account.name}`);
             return account;
           }
           if (rule.fallbackAccountName) {
             const fallbackAccount = accounts2.find((a) => a.name === rule.fallbackAccountName);
             if (fallbackAccount) {
-              strapi2.log.info(`[magic-mail] 🔄 Using fallback account: ${fallbackAccount.name}`);
+              strapi2.log.info(`[magic-mail] [FALLBACK] Using fallback account: ${fallbackAccount.name}`);
               return fallbackAccount;
             }
           }
@@ -3375,7 +3339,7 @@ function requireEmailRouter() {
           mailOptions.headers["List-Unsubscribe-Post"] = "List-Unsubscribe=One-Click";
           mailOptions.headers["Precedence"] = "bulk";
         } else {
-          strapi2.log.warn("[magic-mail] ⚠️ Marketing email without unsubscribe URL - may violate GDPR/CAN-SPAM");
+          strapi2.log.warn("[magic-mail] [WARNING] Marketing email without unsubscribe URL - may violate GDPR/CAN-SPAM");
         }
       }
       if (emailData.headers && typeof emailData.headers === "object") {
@@ -3421,14 +3385,15 @@ function requireEmailRouter() {
             config2.clientSecret
           );
           currentAccessToken = newTokens.accessToken;
-          strapi2.log.info("[magic-mail] ✅ Token refreshed successfully");
+          strapi2.log.info("[magic-mail] [SUCCESS] Token refreshed successfully");
           const { encryptCredentials } = requireEncryption();
           const updatedOAuth = encryptCredentials({
             ...oauth2,
             accessToken: newTokens.accessToken,
             expiresAt: newTokens.expiresAt
           });
-          await strapi2.entityService.update("plugin::magic-mail.email-account", account.id, {
+          await strapi2.documents("plugin::magic-mail.email-account").update({
+            documentId: account.documentId,
             data: { oauth: updatedOAuth }
           });
         } catch (refreshErr) {
@@ -3547,13 +3512,19 @@ function requireEmailRouter() {
           throw new Error(`Gmail API error: ${errorData.error?.message || response.statusText}`);
         }
         const result = await response.json();
-        strapi2.log.info("[magic-mail] ✅ Email sent via Gmail API");
+        strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Gmail API");
         return {
           messageId: result.id,
           response: "OK"
         };
       } catch (err) {
-        strapi2.log.error("[magic-mail] Gmail API send failed:", err);
+        strapi2.log.error("[magic-mail] Gmail API send failed:", err.message || err);
+        strapi2.log.error("[magic-mail] Error details:", {
+          name: err.name,
+          code: err.code,
+          cause: err.cause?.message || err.cause,
+          stack: err.stack?.split("\n").slice(0, 3).join("\n")
+        });
         throw err;
       }
     },
@@ -3596,14 +3567,15 @@ function requireEmailRouter() {
             config2.tenantId
           );
           currentAccessToken = newTokens.accessToken;
-          strapi2.log.info("[magic-mail] ✅ Microsoft token refreshed successfully");
+          strapi2.log.info("[magic-mail] [SUCCESS] Microsoft token refreshed successfully");
           const { encryptCredentials } = requireEncryption();
           const updatedOAuth = encryptCredentials({
             ...oauth2,
             accessToken: newTokens.accessToken,
             expiresAt: newTokens.expiresAt
           });
-          await strapi2.entityService.update("plugin::magic-mail.email-account", account.id, {
+          await strapi2.documents("plugin::magic-mail.email-account").update({
+            documentId: account.documentId,
             data: { oauth: updatedOAuth }
           });
         } catch (refreshErr) {
@@ -3713,7 +3685,7 @@ function requireEmailRouter() {
           strapi2.log.error("[magic-mail] Response status:", response.status);
           throw new Error(`Microsoft Graph API error: ${response.status} - ${response.statusText}`);
         }
-        strapi2.log.info("[magic-mail] ✅ Email sent via Microsoft Graph API with MIME + custom headers");
+        strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Microsoft Graph API with MIME + custom headers");
         strapi2.log.info("[magic-mail] Microsoft adds From/DKIM automatically for DMARC compliance");
         return {
           messageId: `microsoft-${Date.now()}`,
@@ -3755,14 +3727,15 @@ function requireEmailRouter() {
             config2.clientSecret
           );
           currentAccessToken = newTokens.accessToken;
-          strapi2.log.info("[magic-mail] ✅ Token refreshed successfully");
+          strapi2.log.info("[magic-mail] [SUCCESS] Token refreshed successfully");
           const { encryptCredentials } = requireEncryption();
           const updatedOAuth = encryptCredentials({
             ...oauth2,
             accessToken: newTokens.accessToken,
             expiresAt: newTokens.expiresAt
           });
-          await strapi2.entityService.update("plugin::magic-mail.email-account", account.id, {
+          await strapi2.documents("plugin::magic-mail.email-account").update({
+            documentId: account.documentId,
             data: { oauth: updatedOAuth }
           });
         } catch (refreshErr) {
@@ -3808,7 +3781,7 @@ function requireEmailRouter() {
           strapi2.log.info(`[magic-mail] Sending email with ${mailOptions.attachments.length} attachment(s)`);
         }
         const result = await transporter.sendMail(mailOptions);
-        strapi2.log.info("[magic-mail] ✅ Email sent via Yahoo OAuth");
+        strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Yahoo OAuth");
         return {
           messageId: result.messageId,
           response: result.response
@@ -3903,7 +3876,7 @@ function requireEmailRouter() {
           strapi2.log.error("[magic-mail] SendGrid API error:", errorText);
           throw new Error(`SendGrid API error: ${response.statusText}`);
         }
-        strapi2.log.info("[magic-mail] ✅ Email sent via SendGrid API");
+        strapi2.log.info("[magic-mail] [SUCCESS] Email sent via SendGrid API");
         return {
           messageId: response.headers.get("x-message-id") || `sendgrid-${Date.now()}`,
           response: "Accepted"
@@ -3986,7 +3959,7 @@ function requireEmailRouter() {
           throw new Error(`Mailgun API error: ${response.statusText}`);
         }
         const result = await response.json();
-        strapi2.log.info("[magic-mail] ✅ Email sent via Mailgun API");
+        strapi2.log.info("[magic-mail] [SUCCESS] Email sent via Mailgun API");
         return {
           messageId: result.id || `mailgun-${Date.now()}`,
           response: result.message || "Queued"
@@ -4010,10 +3983,15 @@ function requireEmailRouter() {
     },
     /**
      * Update account statistics
+     * Note: This function now expects documentId
      */
-    async updateAccountStats(accountId) {
-      const account = await strapi2.entityService.findOne("plugin::magic-mail.email-account", accountId);
-      await strapi2.entityService.update("plugin::magic-mail.email-account", accountId, {
+    async updateAccountStats(documentId) {
+      const account = await strapi2.documents("plugin::magic-mail.email-account").findOne({
+        documentId
+      });
+      if (!account) return;
+      await strapi2.documents("plugin::magic-mail.email-account").update({
+        documentId,
         data: {
           emailsSentToday: (account.emailsSentToday || 0) + 1,
           emailsSentThisHour: (account.emailsSentThisHour || 0) + 1,
@@ -4034,7 +4012,7 @@ function requireEmailRouter() {
      * Get account by name
      */
     async getAccountByName(name) {
-      const accounts2 = await strapi2.entityService.findMany("plugin::magic-mail.email-account", {
+      const accounts2 = await strapi2.documents("plugin::magic-mail.email-account").findMany({
         filters: { name, isActive: true },
         limit: 1
       });
@@ -4084,7 +4062,7 @@ function requireEmailRouter() {
       if (html && !text) {
         strapi2.log.warn("[magic-mail] Email has HTML but no text alternative - may reduce deliverability");
       }
-      strapi2.log.info("[magic-mail] ✅ Email security validation passed");
+      strapi2.log.info("[magic-mail] [SUCCESS] Email security validation passed");
     },
     /**
      * Add security headers to email data
@@ -4124,7 +4102,24 @@ function requireAccountManager() {
   if (hasRequiredAccountManager) return accountManager;
   hasRequiredAccountManager = 1;
   const { encryptCredentials, decryptCredentials } = requireEncryption();
+  const EMAIL_ACCOUNT_UID = "plugin::magic-mail.email-account";
   accountManager = ({ strapi: strapi2 }) => ({
+    /**
+     * Resolves account ID to documentId (handles both numeric id and documentId)
+     * @param {string|number} idOrDocumentId - Either numeric id or documentId
+     * @returns {Promise<string|null>} The documentId or null if not found
+     */
+    async resolveDocumentId(idOrDocumentId) {
+      if (idOrDocumentId && !/^\d+$/.test(String(idOrDocumentId))) {
+        return String(idOrDocumentId);
+      }
+      const accounts2 = await strapi2.documents(EMAIL_ACCOUNT_UID).findMany({
+        filters: { id: Number(idOrDocumentId) },
+        fields: ["documentId"],
+        limit: 1
+      });
+      return accounts2.length > 0 ? accounts2[0].documentId : null;
+    },
     /**
      * Create new email account
      */
@@ -4146,7 +4141,7 @@ function requireAccountManager() {
       if (isPrimary) {
         await this.unsetAllPrimary();
       }
-      const account = await strapi2.entityService.create("plugin::magic-mail.email-account", {
+      const account = await strapi2.documents(EMAIL_ACCOUNT_UID).create({
         data: {
           name,
           provider,
@@ -4164,14 +4159,20 @@ function requireAccountManager() {
           totalEmailsSent: 0
         }
       });
-      strapi2.log.info(`[magic-mail] ✅ Email account created: ${name}`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Email account created: ${name}`);
       return account;
     },
     /**
      * Update email account
      */
-    async updateAccount(accountId, accountData) {
-      const existingAccount = await strapi2.entityService.findOne("plugin::magic-mail.email-account", accountId);
+    async updateAccount(idOrDocumentId, accountData) {
+      const documentId = await this.resolveDocumentId(idOrDocumentId);
+      if (!documentId) {
+        throw new Error("Account not found");
+      }
+      const existingAccount = await strapi2.documents(EMAIL_ACCOUNT_UID).findOne({
+        documentId
+      });
       if (!existingAccount) {
         throw new Error("Account not found");
       }
@@ -4193,7 +4194,8 @@ function requireAccountManager() {
       if (isPrimary && !existingAccount.isPrimary) {
         await this.unsetAllPrimary();
       }
-      const updatedAccount = await strapi2.entityService.update("plugin::magic-mail.email-account", accountId, {
+      const updatedAccount = await strapi2.documents(EMAIL_ACCOUNT_UID).update({
+        documentId,
         data: {
           name,
           description,
@@ -4209,14 +4211,20 @@ function requireAccountManager() {
           hourlyLimit
         }
       });
-      strapi2.log.info(`[magic-mail] ✅ Email account updated: ${name} (Active: ${isActive})`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Email account updated: ${name} (Active: ${isActive})`);
       return updatedAccount;
     },
     /**
      * Test email account
      */
-    async testAccount(accountId, testEmail, testOptions = {}) {
-      const account = await strapi2.entityService.findOne("plugin::magic-mail.email-account", accountId);
+    async testAccount(idOrDocumentId, testEmail, testOptions = {}) {
+      const documentId = await this.resolveDocumentId(idOrDocumentId);
+      if (!documentId) {
+        throw new Error("Account not found");
+      }
+      const account = await strapi2.documents(EMAIL_ACCOUNT_UID).findOne({
+        documentId
+      });
       if (!account) {
         throw new Error("Account not found");
       }
@@ -4295,8 +4303,8 @@ If you receive this, your email account is configured correctly!`,
      * Get all accounts
      */
     async getAllAccounts() {
-      const accounts2 = await strapi2.entityService.findMany("plugin::magic-mail.email-account", {
-        sort: { priority: "desc" }
+      const accounts2 = await strapi2.documents(EMAIL_ACCOUNT_UID).findMany({
+        sort: [{ priority: "desc" }]
       });
       return accounts2.map((account) => ({
         ...account,
@@ -4306,8 +4314,14 @@ If you receive this, your email account is configured correctly!`,
     /**
      * Get single account with decrypted config (for editing)
      */
-    async getAccountWithDecryptedConfig(accountId) {
-      const account = await strapi2.entityService.findOne("plugin::magic-mail.email-account", accountId);
+    async getAccountWithDecryptedConfig(idOrDocumentId) {
+      const documentId = await this.resolveDocumentId(idOrDocumentId);
+      if (!documentId) {
+        throw new Error("Account not found");
+      }
+      const account = await strapi2.documents(EMAIL_ACCOUNT_UID).findOne({
+        documentId
+      });
       if (!account) {
         throw new Error("Account not found");
       }
@@ -4320,19 +4334,24 @@ If you receive this, your email account is configured correctly!`,
     /**
      * Delete account
      */
-    async deleteAccount(accountId) {
-      await strapi2.entityService.delete("plugin::magic-mail.email-account", accountId);
-      strapi2.log.info(`[magic-mail] Account deleted: ${accountId}`);
+    async deleteAccount(idOrDocumentId) {
+      const documentId = await this.resolveDocumentId(idOrDocumentId);
+      if (!documentId) {
+        throw new Error("Account not found");
+      }
+      await strapi2.documents(EMAIL_ACCOUNT_UID).delete({ documentId });
+      strapi2.log.info(`[magic-mail] Account deleted: ${documentId}`);
     },
     /**
      * Unset all primary flags
      */
     async unsetAllPrimary() {
-      const accounts2 = await strapi2.entityService.findMany("plugin::magic-mail.email-account", {
+      const accounts2 = await strapi2.documents(EMAIL_ACCOUNT_UID).findMany({
         filters: { isPrimary: true }
       });
       for (const account of accounts2) {
-        await strapi2.entityService.update("plugin::magic-mail.email-account", account.id, {
+        await strapi2.documents(EMAIL_ACCOUNT_UID).update({
+          documentId: account.documentId,
           data: { isPrimary: false }
         });
       }
@@ -4341,7 +4360,7 @@ If you receive this, your email account is configured correctly!`,
      * Reset daily/hourly counters (called by cron)
      */
     async resetCounters(type = "daily") {
-      const accounts2 = await strapi2.entityService.findMany("plugin::magic-mail.email-account");
+      const accounts2 = await strapi2.documents(EMAIL_ACCOUNT_UID).findMany({});
       for (const account of accounts2) {
         const updateData = {};
         if (type === "daily") {
@@ -4349,11 +4368,12 @@ If you receive this, your email account is configured correctly!`,
         } else if (type === "hourly") {
           updateData.emailsSentThisHour = 0;
         }
-        await strapi2.entityService.update("plugin::magic-mail.email-account", account.id, {
+        await strapi2.documents(EMAIL_ACCOUNT_UID).update({
+          documentId: account.documentId,
           data: updateData
         });
       }
-      strapi2.log.info(`[magic-mail] ✅ ${type} counters reset`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] ${type} counters reset`);
     }
   });
   return accountManager;
@@ -4411,7 +4431,7 @@ function requireOauth() {
         throw new Error(`Failed to exchange code for tokens: ${response.status}`);
       }
       const tokens = await response.json();
-      strapi2.log.info("[magic-mail] ✅ Tokens received from Google");
+      strapi2.log.info("[magic-mail] [SUCCESS] Tokens received from Google");
       if (!tokens.access_token) {
         throw new Error("No access token received from Google");
       }
@@ -4425,7 +4445,7 @@ function requireOauth() {
         throw new Error("Failed to get user email from Google");
       }
       const userInfo = await userInfoResponse.json();
-      strapi2.log.info(`[magic-mail] ✅ Got user email from Google: ${userInfo.email}`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Got user email from Google: ${userInfo.email}`);
       if (!userInfo.email) {
         strapi2.log.error("[magic-mail] userInfo:", userInfo);
         throw new Error("Google did not provide email address");
@@ -4529,7 +4549,7 @@ function requireOauth() {
         throw new Error(`Failed to exchange code for tokens: ${response.status} - ${errorData}`);
       }
       const tokens = await response.json();
-      strapi2.log.info("[magic-mail] ✅ Tokens received from Microsoft");
+      strapi2.log.info("[magic-mail] [SUCCESS] Tokens received from Microsoft");
       strapi2.log.info("[magic-mail] Has access_token:", !!tokens.access_token);
       strapi2.log.info("[magic-mail] Has refresh_token:", !!tokens.refresh_token);
       strapi2.log.info("[magic-mail] Has id_token:", !!tokens.id_token);
@@ -4542,7 +4562,7 @@ function requireOauth() {
           const payloadBase64 = tokens.id_token.split(".")[1];
           const payload = JSON.parse(Buffer.from(payloadBase64, "base64").toString());
           email = payload.email || payload.preferred_username || payload.upn;
-          strapi2.log.info(`[magic-mail] ✅ Got email from Microsoft ID token: ${email}`);
+          strapi2.log.info(`[magic-mail] [SUCCESS] Got email from Microsoft ID token: ${email}`);
         } catch (jwtErr) {
           strapi2.log.warn("[magic-mail] Could not decode ID token:", jwtErr.message);
         }
@@ -4564,7 +4584,7 @@ function requireOauth() {
         const userInfo = await userInfoResponse.json();
         strapi2.log.info("[magic-mail] User info from Graph:", JSON.stringify(userInfo, null, 2));
         email = userInfo.mail || userInfo.userPrincipalName;
-        strapi2.log.info(`[magic-mail] ✅ Got email from Microsoft Graph: ${email}`);
+        strapi2.log.info(`[magic-mail] [SUCCESS] Got email from Microsoft Graph: ${email}`);
       }
       if (!email) {
         strapi2.log.error("[magic-mail] Microsoft did not provide email - ID token and Graph API both failed");
@@ -4608,7 +4628,7 @@ function requireOauth() {
         throw new Error(`Failed to refresh Microsoft tokens: ${response.status}`);
       }
       const tokens = await response.json();
-      strapi2.log.info("[magic-mail] ✅ Microsoft tokens refreshed successfully");
+      strapi2.log.info("[magic-mail] [SUCCESS] Microsoft tokens refreshed successfully");
       return {
         accessToken: tokens.access_token,
         expiresAt: new Date(Date.now() + (tokens.expires_in || 3600) * 1e3)
@@ -4663,7 +4683,7 @@ function requireOauth() {
         throw new Error(`Failed to exchange code for tokens: ${response.status}`);
       }
       const tokens = await response.json();
-      strapi2.log.info("[magic-mail] ✅ Tokens received from Yahoo");
+      strapi2.log.info("[magic-mail] [SUCCESS] Tokens received from Yahoo");
       if (!tokens.access_token) {
         throw new Error("No access token received from Yahoo");
       }
@@ -4678,7 +4698,7 @@ function requireOauth() {
       }
       const userInfo = await userInfoResponse.json();
       const email = userInfo.email;
-      strapi2.log.info(`[magic-mail] ✅ Got email from Yahoo: ${email}`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Got email from Yahoo: ${email}`);
       if (!email) {
         throw new Error("Yahoo did not provide email address");
       }
@@ -4739,7 +4759,7 @@ function requireOauth() {
         refreshToken: tokenData.refreshToken,
         expiresAt: tokenData.expiresAt
       });
-      const account = await strapi2.entityService.create("plugin::magic-mail.email-account", {
+      const account = await strapi2.documents("plugin::magic-mail.email-account").create({
         data: {
           name: accountDetails.name,
           description: accountDetails.description || "",
@@ -4749,7 +4769,7 @@ function requireOauth() {
           oauth: encryptedOAuth,
           // OAuth tokens
           fromEmail: tokenData.email,
-          // ✅ Use email from Google, not from accountDetails
+          // [SUCCESS] Use email from Google, not from accountDetails
           fromName: accountDetails.fromName || tokenData.email.split("@")[0],
           replyTo: accountDetails.replyTo || tokenData.email,
           isActive: true,
@@ -4762,13 +4782,13 @@ function requireOauth() {
           totalEmailsSent: 0
         }
       });
-      strapi2.log.info(`[magic-mail] ✅ OAuth account created: ${accountDetails.name} (${tokenData.email})`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] OAuth account created: ${accountDetails.name} (${tokenData.email})`);
       return account;
     }
   });
   return oauth;
 }
-const version = "2.0.1";
+const version = "2.0.2";
 const require$$2 = {
   version
 };
@@ -4862,14 +4882,14 @@ function requireLicenseGuard() {
         });
         const data = await response.json();
         if (data.success) {
-          strapi2.log.info("[magic-mail] ✅ License created:", data.data.licenseKey);
+          strapi2.log.info("[magic-mail] [SUCCESS] License created:", data.data.licenseKey);
           return data.data;
         } else {
-          strapi2.log.error("[magic-mail] ❌ License creation failed:", data);
+          strapi2.log.error("[magic-mail] [ERROR] License creation failed:", data);
           return null;
         }
       } catch (error) {
-        strapi2.log.error("[magic-mail] ❌ Error creating license:", error);
+        strapi2.log.error("[magic-mail] [ERROR] Error creating license:", error);
         return null;
       }
     },
@@ -4897,10 +4917,10 @@ function requireLicenseGuard() {
         }
       } catch (error) {
         if (allowGracePeriod) {
-          strapi2.log.warn("[magic-mail] ⚠️ License verification timeout - grace period active");
+          strapi2.log.warn("[magic-mail] [WARNING] License verification timeout - grace period active");
           return { valid: true, data: null, gracePeriod: true };
         }
-        strapi2.log.error("[magic-mail] ❌ License verification error:", error.message);
+        strapi2.log.error("[magic-mail] [ERROR] License verification error:", error.message);
         return { valid: false, data: null };
       }
     },
@@ -4953,7 +4973,7 @@ function requireLicenseGuard() {
         name: "magic-mail"
       });
       await pluginStore.set({ key: "licenseKey", value: licenseKey });
-      strapi2.log.info(`[magic-mail] ✅ License key stored: ${licenseKey.substring(0, 8)}...`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] License key stored: ${licenseKey.substring(0, 8)}...`);
     },
     startPinging(licenseKey, intervalMinutes = 15) {
       this.pingLicense(licenseKey);
@@ -4982,7 +5002,7 @@ function requireLicenseGuard() {
         const license2 = await this.getLicenseByKey(licenseKey);
         return license2;
       } catch (error) {
-        strapi2.log.error(`[magic-mail] ❌ Error loading license:`, error);
+        strapi2.log.error(`[magic-mail] [ERROR] Error loading license:`, error);
         return null;
       }
     },
@@ -5032,7 +5052,7 @@ function requireLicenseGuard() {
      */
     async initialize() {
       try {
-        strapi2.log.info("🔐 Initializing License Guard...");
+        strapi2.log.info("[INIT] Initializing License Guard...");
         const pluginStore = strapi2.store({
           type: "plugin",
           name: "magic-mail"
@@ -5050,53 +5070,53 @@ function requireLicenseGuard() {
         strapi2.log.info("──────────────────────────────────────────────────────────");
         strapi2.log.info(`📦 Plugin Store Check:`);
         if (licenseKey) {
-          strapi2.log.info(`   ✅ License Key found: ${licenseKey}`);
-          strapi2.log.info(`   🔑 Key (short): ${licenseKey.substring(0, 10)}...`);
+          strapi2.log.info(`   [SUCCESS] License Key found: ${licenseKey}`);
+          strapi2.log.info(`   [LICENSE] Key (short): ${licenseKey.substring(0, 10)}...`);
           if (lastValidated) {
             const lastValidatedDate = new Date(lastValidated);
             const hoursAgo = Math.floor((now.getTime() - lastValidatedDate.getTime()) / (1e3 * 60 * 60));
-            strapi2.log.info(`   🕐 Last validated: ${hoursAgo}h ago (Grace: ${withinGracePeriod ? "ACTIVE" : "EXPIRED"})`);
+            strapi2.log.info(`   [TIME] Last validated: ${hoursAgo}h ago (Grace: ${withinGracePeriod ? "ACTIVE" : "EXPIRED"})`);
           } else {
-            strapi2.log.info(`   🕐 Last validated: Never (Grace: ACTIVE for first ${gracePeriodHours}h)`);
+            strapi2.log.info(`   [TIME] Last validated: Never (Grace: ACTIVE for first ${gracePeriodHours}h)`);
           }
         } else {
-          strapi2.log.info(`   ❌ No license key stored`);
+          strapi2.log.info(`   [ERROR] No license key stored`);
         }
         strapi2.log.info("──────────────────────────────────────────────────────────");
         if (!licenseKey) {
-          strapi2.log.info("📄 No license found - Running in demo mode");
-          strapi2.log.info("💡 Create a license in the admin panel to activate full features");
+          strapi2.log.info("[DEMO] No license found - Running in demo mode");
+          strapi2.log.info("[INFO] Create a license in the admin panel to activate full features");
           return {
             valid: false,
             demo: true,
             data: null
           };
         }
-        strapi2.log.info("📄 Verifying stored license key...");
+        strapi2.log.info("[VERIFY] Verifying stored license key...");
         const verification = await this.verifyLicense(licenseKey, withinGracePeriod);
         if (verification.valid) {
           const license2 = await this.getLicenseByKey(licenseKey);
-          strapi2.log.info(`✅ License verified online: ACTIVE (Key: ${licenseKey.substring(0, 10)}...)`);
+          strapi2.log.info(`[SUCCESS] License verified online: ACTIVE (Key: ${licenseKey.substring(0, 10)}...)`);
           await pluginStore.set({
             key: "lastValidated",
             value: now.toISOString()
           });
-          strapi2.log.info("✅ License is valid and active");
+          strapi2.log.info("[SUCCESS] License is valid and active");
           const pingInterval = this.startPinging(licenseKey, 15);
-          strapi2.log.info("📡 Started pinging license every 15 minutes");
+          strapi2.log.info("[PING] Started pinging license every 15 minutes");
           strapi2.licenseGuardMagicMail = {
             licenseKey,
             pingInterval,
             data: verification.data
           };
           strapi2.log.info("╔════════════════════════════════════════════════════════════════╗");
-          strapi2.log.info("║  ✅ MAGIC MAIL PLUGIN LICENSE ACTIVE                           ║");
+          strapi2.log.info("║  [SUCCESS] MAGIC MAIL PLUGIN LICENSE ACTIVE                           ║");
           strapi2.log.info("║                                                                ║");
           strapi2.log.info(`║  License: ${licenseKey.padEnd(38, " ")}║`);
           strapi2.log.info(`║  User: ${(license2?.firstName + " " + license2?.lastName).padEnd(41, " ")}║`);
           strapi2.log.info(`║  Email: ${(license2?.email || "N/A").padEnd(40, " ")}║`);
           strapi2.log.info("║                                                                ║");
-          strapi2.log.info("║  🔄 Auto-pinging every 15 minutes                              ║");
+          strapi2.log.info("║  [AUTO] Pinging every 15 minutes                               ║");
           strapi2.log.info("╚════════════════════════════════════════════════════════════════╝");
           return {
             valid: true,
@@ -5105,9 +5125,9 @@ function requireLicenseGuard() {
             gracePeriod: verification.gracePeriod || false
           };
         } else {
-          strapi2.log.error(`❌ License validation failed (Key: ${licenseKey.substring(0, 10)}...)`);
+          strapi2.log.error(`[ERROR] License validation failed (Key: ${licenseKey.substring(0, 10)}...)`);
           strapi2.log.info("──────────────────────────────────────────────────────────");
-          strapi2.log.info("⚠️  Running in demo mode with limited features");
+          strapi2.log.info("[WARNING]  Running in demo mode with limited features");
           return {
             valid: false,
             demo: true,
@@ -5116,7 +5136,7 @@ function requireLicenseGuard() {
           };
         }
       } catch (error) {
-        strapi2.log.error("❌ Error initializing License Guard:", error);
+        strapi2.log.error("[ERROR] Error initializing License Guard:", error);
         return {
           valid: false,
           demo: true,
@@ -5136,6 +5156,8 @@ function requireEmailDesigner() {
   const Mustache = require$$0$3;
   const htmlToTextLib = require$$1$2;
   const decode = require$$2$2;
+  const EMAIL_TEMPLATE_UID = "plugin::magic-mail.email-template";
+  const EMAIL_TEMPLATE_VERSION_UID = "plugin::magic-mail.email-template-version";
   const convertHtmlToText = (html, options2 = { wordwrap: 130 }) => {
     try {
       if (!html || typeof html !== "string") {
@@ -5173,24 +5195,36 @@ function requireEmailDesigner() {
      * Get all templates
      */
     async findAll(filters = {}) {
-      return strapi2.entityService.findMany("plugin::magic-mail.email-template", {
+      return strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
         filters,
-        sort: { createdAt: "desc" }
+        sort: [{ createdAt: "desc" }]
       });
     },
     /**
-     * Get template by ID with populated versions
+     * Get template by ID (documentId) with populated versions
      */
-    async findOne(id) {
-      return strapi2.entityService.findOne("plugin::magic-mail.email-template", id, {
+    async findOne(documentId) {
+      return strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
+        documentId,
         populate: ["versions"]
       });
     },
+    /**
+     * Get template by numeric ID (for backward compatibility)
+     */
+    async findById(id) {
+      const results = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
+        filters: { id },
+        limit: 1,
+        populate: ["versions"]
+      });
+      return results.length > 0 ? results[0] : null;
+    },
     /**
      * Get template by reference ID
      */
     async findByReferenceId(templateReferenceId) {
-      const results = await strapi2.entityService.findMany("plugin::magic-mail.email-template", {
+      const results = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
         filters: { templateReferenceId },
         limit: 1
       });
@@ -5198,17 +5232,11 @@ function requireEmailDesigner() {
     },
     /**
      * Create new template with automatic initial version
-     * 
-     * Steps:
-     * 1. Check license limits
-     * 2. Validate reference ID is unique
-     * 3. Create template
-     * 4. Create initial version (if versioning enabled)
      */
     async create(data) {
-      strapi2.log.info("[magic-mail] 📝 Creating new template...");
+      strapi2.log.info("[magic-mail] [TEST] Creating new template...");
       const maxTemplates = await strapi2.plugin("magic-mail").service("license-guard").getMaxEmailTemplates();
-      const currentCount = await strapi2.db.query("plugin::magic-mail.email-template").count();
+      const currentCount = await strapi2.documents(EMAIL_TEMPLATE_UID).count();
       if (maxTemplates !== -1 && currentCount >= maxTemplates) {
         throw new Error(
           `Template limit reached (${maxTemplates}). Upgrade your license to create more templates.`
@@ -5220,17 +5248,17 @@ function requireEmailDesigner() {
           throw new Error(`Template with reference ID ${data.templateReferenceId} already exists`);
         }
       }
-      const template = await strapi2.entityService.create("plugin::magic-mail.email-template", {
+      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).create({
         data: {
           ...data,
           isActive: data.isActive !== void 0 ? data.isActive : true
         }
       });
-      strapi2.log.info(`[magic-mail] ✅ Template created: ID=${template.id}, name="${template.name}"`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Template created: documentId=${template.documentId}, name="${template.name}"`);
       const hasVersioning = await strapi2.plugin("magic-mail").service("license-guard").hasFeature("email-designer-versioning");
       if (hasVersioning) {
-        strapi2.log.info("[magic-mail] 💾 Creating initial version...");
-        await this.createVersion(template.id, {
+        strapi2.log.info("[magic-mail] [SAVE] Creating initial version...");
+        await this.createVersion(template.documentId, {
           name: data.name,
           subject: data.subject,
           design: data.design,
@@ -5238,33 +5266,26 @@ function requireEmailDesigner() {
           bodyText: data.bodyText,
           tags: data.tags
         });
-        strapi2.log.info("[magic-mail] ✅ Initial version created");
+        strapi2.log.info("[magic-mail] [SUCCESS] Initial version created");
       } else {
-        strapi2.log.info("[magic-mail] ⏭️  Versioning not enabled, skipping initial version");
+        strapi2.log.info("[magic-mail] [SKIP] Versioning not enabled, skipping initial version");
       }
       return template;
     },
     /**
      * Update template with automatic version snapshot
-     * 
-     * Steps:
-     * 1. Load existing template
-     * 2. Create version snapshot of CURRENT state (before update)
-     * 3. Update template with new data
-     * 
-     * IMPORTANT: Version is created BEFORE update to preserve old state!
-     */
-    async update(id, data) {
-      strapi2.log.info(`[magic-mail] 🔄 Updating template ID: ${id}`);
-      const template = await this.findOne(id);
+     */
+    async update(documentId, data) {
+      strapi2.log.info(`[magic-mail] [UPDATE] Updating template documentId: ${documentId}`);
+      const template = await this.findOne(documentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] 📋 Found template: ID=${template.id}, name="${template.name}"`);
+      strapi2.log.info(`[magic-mail] [INFO] Found template: documentId=${template.documentId}, name="${template.name}"`);
       const hasVersioning = await strapi2.plugin("magic-mail").service("license-guard").hasFeature("email-designer-versioning");
       if (hasVersioning) {
-        strapi2.log.info("[magic-mail] 💾 Creating version snapshot before update...");
-        await this.createVersion(template.id, {
+        strapi2.log.info("[magic-mail] [SAVE] Creating version snapshot before update...");
+        await this.createVersion(template.documentId, {
           name: template.name,
           subject: template.subject,
           design: template.design,
@@ -5272,66 +5293,62 @@ function requireEmailDesigner() {
           bodyText: template.bodyText,
           tags: template.tags
         });
-        strapi2.log.info("[magic-mail] ✅ Version snapshot created");
-      } else {
-        strapi2.log.info("[magic-mail] ⏭️  Versioning not enabled, skipping version snapshot");
+        strapi2.log.info("[magic-mail] [SUCCESS] Version snapshot created");
       }
       const updateData = { ...data };
       if ("versions" in updateData) {
         delete updateData.versions;
-        strapi2.log.warn("[magic-mail] ⚠️  Removed versions field from update data to prevent relation overwrite");
+        strapi2.log.warn("[magic-mail] [WARNING]  Removed versions field from update data");
       }
-      const updated = await strapi2.entityService.update("plugin::magic-mail.email-template", id, {
+      const updated = await strapi2.documents(EMAIL_TEMPLATE_UID).update({
+        documentId,
         data: updateData
       });
-      strapi2.log.info(`[magic-mail] ✅ Template updated: ID=${updated.id}, versions preserved`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Template updated: documentId=${updated.documentId}`);
       return updated;
     },
     /**
      * Delete template and all its versions
-     * 
-     * Uses Document Service for version deletion to ensure cascading delete
      */
-    async delete(id) {
-      strapi2.log.info(`[magic-mail] 🗑️  Deleting template ID: ${id}`);
-      const template = await this.findOne(id);
+    async delete(documentId) {
+      strapi2.log.info(`[magic-mail] [DELETE]  Deleting template documentId: ${documentId}`);
+      const template = await this.findOne(documentId);
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] 🗑️  Template: ID=${template.id}, name="${template.name}"`);
-      const allVersions = await strapi2.documents("plugin::magic-mail.email-template-version").findMany({
+      strapi2.log.info(`[magic-mail] [DELETE]  Template: documentId=${template.documentId}, name="${template.name}"`);
+      const allVersions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
             documentId: template.documentId
           }
         }
       });
-      strapi2.log.info(`[magic-mail] 🗑️  Found ${allVersions.length} versions to delete`);
+      strapi2.log.info(`[magic-mail] [DELETE]  Found ${allVersions.length} versions to delete`);
       for (const version2 of allVersions) {
         try {
-          await strapi2.documents("plugin::magic-mail.email-template-version").delete({ documentId: version2.documentId });
-          strapi2.log.info(`[magic-mail] 🗑️  Deleted version #${version2.versionNumber}`);
+          await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
+            documentId: version2.documentId
+          });
+          strapi2.log.info(`[magic-mail] [DELETE]  Deleted version #${version2.versionNumber}`);
         } catch (versionError) {
-          strapi2.log.warn(`[magic-mail] ⚠️  Failed to delete version ${version2.id}: ${versionError.message}`);
+          strapi2.log.warn(`[magic-mail] [WARNING]  Failed to delete version: ${versionError.message}`);
         }
       }
-      const result = await strapi2.entityService.delete("plugin::magic-mail.email-template", id);
-      strapi2.log.info(`[magic-mail] ✅ Template "${template.name}" and ${allVersions.length} versions deleted`);
+      const result = await strapi2.documents(EMAIL_TEMPLATE_UID).delete({ documentId });
+      strapi2.log.info(`[magic-mail] [SUCCESS] Template "${template.name}" and ${allVersions.length} versions deleted`);
       return result;
     },
     /**
      * Duplicate template
-     * 
-     * Creates a copy of an existing template with " copy" suffix
-     * Does NOT copy versions, starts fresh
      */
-    async duplicate(id) {
-      strapi2.log.info(`[magic-mail] 📋 Duplicating template ID: ${id}`);
-      const original = await this.findOne(id);
+    async duplicate(documentId) {
+      strapi2.log.info(`[magic-mail] [INFO] Duplicating template documentId: ${documentId}`);
+      const original = await this.findOne(documentId);
       if (!original) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] 📦 Original template: ID=${original.id}, name="${original.name}"`);
+      strapi2.log.info(`[magic-mail] [PACKAGE] Original template: documentId=${original.documentId}, name="${original.name}"`);
       const duplicateData = {
         name: `${original.name} copy`,
         subject: original.subject,
@@ -5341,11 +5358,10 @@ function requireEmailDesigner() {
         category: original.category,
         tags: original.tags,
         isActive: original.isActive,
-        // Generate new templateReferenceId (unique ID)
         templateReferenceId: Date.now() + Math.floor(Math.random() * 1e3)
       };
       const duplicated = await this.create(duplicateData);
-      strapi2.log.info(`[magic-mail] ✅ Template duplicated: ID=${duplicated.id}, name="${duplicated.name}"`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Template duplicated: documentId=${duplicated.documentId}`);
       return duplicated;
     },
     // ============================================================
@@ -5353,134 +5369,81 @@ function requireEmailDesigner() {
     // ============================================================
     /**
      * Create a new version for a template
-     * 
-     * CRITICAL: This is THE ONLY function that creates versions!
-     * 
-     * Steps:
-     * 1. Verify template exists
-     * 2. Calculate next version number
-     * 3. Create version WITH template relation
-     * 
-     * @param {number} templateId - Numeric ID of template
-     * @param {object} data - Version data (name, subject, bodyHtml, etc)
-     * @returns {object} Created version
-     */
-    async createVersion(templateId, data) {
-      strapi2.log.info(`[magic-mail] 📸 Creating version for template ID: ${templateId}`);
-      const template = await strapi2.entityService.findOne("plugin::magic-mail.email-template", templateId);
+     */
+    async createVersion(templateDocumentId, data) {
+      strapi2.log.info(`[magic-mail] [SNAPSHOT] Creating version for template documentId: ${templateDocumentId}`);
+      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
+        documentId: templateDocumentId
+      });
       if (!template) {
-        throw new Error(`Template ${templateId} not found`);
+        throw new Error(`Template ${templateDocumentId} not found`);
       }
-      strapi2.log.info(`[magic-mail] 📦 Template found: ID=${template.id}, name="${template.name}"`);
-      const existingVersions = await strapi2.entityService.findMany("plugin::magic-mail.email-template-version", {
+      strapi2.log.info(`[magic-mail] [PACKAGE] Template found: documentId=${template.documentId}, name="${template.name}"`);
+      const existingVersions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            id: templateId
-            // Use numeric ID in filter
+            documentId: templateDocumentId
           }
         },
-        sort: { versionNumber: "desc" }
+        sort: [{ versionNumber: "desc" }]
       });
       const versionNumber = existingVersions.length > 0 ? Math.max(...existingVersions.map((v) => v.versionNumber || 0)) + 1 : 1;
-      strapi2.log.info(`[magic-mail] 📊 Existing versions: ${existingVersions.length} → Next version: #${versionNumber}`);
-      const createdVersion = await strapi2.entityService.create("plugin::magic-mail.email-template-version", {
+      strapi2.log.info(`[magic-mail] [STATS] Existing versions: ${existingVersions.length} → Next version: #${versionNumber}`);
+      const createdVersion = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).create({
         data: {
           versionNumber,
           ...data,
-          template: {
-            connect: [templateId]
-            // ✅ Use connect array for Strapi v5!
-          }
+          template: templateDocumentId
+          // Document Service handles relations with documentId
         }
       });
-      strapi2.log.info(`[magic-mail] 📝 Version created with connect: ID=${createdVersion.id}`);
-      const verifiedVersion = await strapi2.entityService.findOne(
-        "plugin::magic-mail.email-template-version",
-        createdVersion.id,
-        {
-          populate: ["template"]
-        }
-      );
-      strapi2.log.info(
-        `[magic-mail] ✅ Version created successfully:
-   - Version ID: ${createdVersion.id}
-   - Version #: ${versionNumber}
-   - Template ID: ${templateId}
-   - Has template relation: ${!!verifiedVersion.template}
-   - Template in DB: ${verifiedVersion.template?.id || "NULL"}`
-      );
-      if (!verifiedVersion.template) {
-        strapi2.log.error(
-          `[magic-mail] ❌ CRITICAL: Version ${createdVersion.id} was created but template relation was NOT set!
-   This is a Strapi v5 relation bug. Investigating...`
-        );
-      }
-      return verifiedVersion;
+      strapi2.log.info(`[magic-mail] [SUCCESS] Version created: documentId=${createdVersion.documentId}, v${versionNumber}`);
+      return createdVersion;
     },
     /**
      * Get all versions for a template
      */
-    async getVersions(templateId) {
-      strapi2.log.info(`[magic-mail] 📜 Fetching versions for template ID: ${templateId}`);
-      const template = await strapi2.entityService.findOne("plugin::magic-mail.email-template", templateId, {
+    async getVersions(templateDocumentId) {
+      strapi2.log.info(`[magic-mail] 📜 Fetching versions for template documentId: ${templateDocumentId}`);
+      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
+        documentId: templateDocumentId,
         populate: ["versions"]
       });
       if (!template) {
         throw new Error("Template not found");
       }
-      strapi2.log.info(`[magic-mail] 📦 Template has ${template.versions?.length || 0} versions in relation`);
+      strapi2.log.info(`[magic-mail] [PACKAGE] Template has ${template.versions?.length || 0} versions`);
       if (template.versions && template.versions.length > 0) {
         const sortedVersions = [...template.versions].sort((a, b) => b.versionNumber - a.versionNumber);
-        strapi2.log.info(`[magic-mail] ✅ Returning ${sortedVersions.length} versions from template populate`);
         return sortedVersions;
       }
-      strapi2.log.warn(`[magic-mail] ⚠️  Template has no populated versions, trying filter...`);
-      const versions = await strapi2.entityService.findMany("plugin::magic-mail.email-template-version", {
+      const versions = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findMany({
         filters: {
           template: {
-            id: templateId
+            documentId: templateDocumentId
           }
         },
-        sort: { versionNumber: "desc" },
-        populate: ["template"]
+        sort: [{ versionNumber: "desc" }]
       });
-      strapi2.log.info(`[magic-mail] ✅ Found ${versions.length} versions via filter`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Found ${versions.length} versions`);
       return versions;
     },
     /**
      * Restore template from a specific version
-     * 
-     * Updates the template with data from the version
-     * This will create a NEW version snapshot (via update logic)
      */
-    async restoreVersion(templateId, versionId) {
-      strapi2.log.info(`[magic-mail] 🔄 Restoring template ${templateId} from version ${versionId}`);
-      const version2 = await strapi2.entityService.findOne("plugin::magic-mail.email-template-version", versionId, {
+    async restoreVersion(templateDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [RESTORE] Restoring template ${templateDocumentId} from version ${versionDocumentId}`);
+      const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+        documentId: versionDocumentId,
         populate: ["template"]
       });
       if (!version2) {
         throw new Error("Version not found");
       }
-      strapi2.log.info(`[magic-mail] 📦 Version found: ID=${version2.id}, versionNumber=${version2.versionNumber}, has template: ${!!version2.template}`);
-      if (version2.template?.id) {
-        if (version2.template.id !== parseInt(templateId)) {
-          strapi2.log.error(`[magic-mail] ❌ Version ${versionId} belongs to template ${version2.template.id}, not ${templateId}`);
-          throw new Error("Version does not belong to this template");
-        }
-        strapi2.log.info(`[magic-mail] ✅ Version has correct template relation`);
-      } else {
-        strapi2.log.warn(`[magic-mail] ⚠️  Version ${versionId} has no template relation, checking template's versions array...`);
-        const template = await strapi2.entityService.findOne("plugin::magic-mail.email-template", templateId, {
-          populate: ["versions"]
-        });
-        const versionExists = template.versions && template.versions.some((v) => v.id === parseInt(versionId));
-        if (!versionExists) {
-          strapi2.log.error(`[magic-mail] ❌ Version ${versionId} not found in template ${templateId} versions array`);
-          throw new Error("Version does not belong to this template");
-        }
-        strapi2.log.info(`[magic-mail] ✅ Version ${versionId} found in template's versions array (old version without relation)`);
+      if (version2.template?.documentId !== templateDocumentId) {
+        throw new Error("Version does not belong to this template");
       }
-      const restored = await this.update(templateId, {
+      const restored = await this.update(templateDocumentId, {
         name: version2.name,
         subject: version2.subject,
         design: version2.design,
@@ -5488,93 +5451,65 @@ function requireEmailDesigner() {
         bodyText: version2.bodyText,
         tags: version2.tags
       });
-      strapi2.log.info(`[magic-mail] ✅ Template restored from version #${version2.versionNumber}`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Template restored from version #${version2.versionNumber}`);
       return restored;
     },
     /**
      * Delete a single version
-     * 
-     * @param {number} templateId - Template ID (for verification)
-     * @param {number} versionId - Version ID to delete
      */
-    async deleteVersion(templateId, versionId) {
-      strapi2.log.info(`[magic-mail] 🗑️  Deleting version ${versionId} from template ${templateId}`);
-      const version2 = await strapi2.entityService.findOne("plugin::magic-mail.email-template-version", versionId, {
+    async deleteVersion(templateDocumentId, versionDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE]  Deleting version ${versionDocumentId}`);
+      const version2 = await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).findOne({
+        documentId: versionDocumentId,
         populate: ["template"]
       });
       if (!version2) {
         throw new Error("Version not found");
       }
-      if (version2.template?.id) {
-        if (version2.template.id !== parseInt(templateId)) {
-          strapi2.log.error(`[magic-mail] ❌ Version ${versionId} belongs to template ${version2.template.id}, not ${templateId}`);
-          throw new Error("Version does not belong to this template");
-        }
-        strapi2.log.info(`[magic-mail] ✅ Version has correct template relation`);
-      } else {
-        strapi2.log.warn(`[magic-mail] ⚠️  Version ${versionId} has no template relation, checking template's versions array...`);
-        const template = await strapi2.entityService.findOne("plugin::magic-mail.email-template", templateId, {
-          populate: ["versions"]
-        });
-        const versionExists = template.versions && template.versions.some((v) => v.id === parseInt(versionId));
-        if (!versionExists) {
-          strapi2.log.error(`[magic-mail] ❌ Version ${versionId} not found in template ${templateId} versions array`);
-          throw new Error("Version does not belong to this template");
-        }
-        strapi2.log.info(`[magic-mail] ✅ Version ${versionId} found in template's versions array`);
+      if (version2.template?.documentId !== templateDocumentId) {
+        throw new Error("Version does not belong to this template");
       }
-      await strapi2.entityService.delete("plugin::magic-mail.email-template-version", versionId);
-      strapi2.log.info(`[magic-mail] ✅ Version ${versionId} (v${version2.versionNumber}) deleted successfully`);
+      await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
+        documentId: versionDocumentId
+      });
+      strapi2.log.info(`[magic-mail] [SUCCESS] Version v${version2.versionNumber} deleted`);
       return { success: true, message: "Version deleted" };
     },
     /**
      * Delete all versions for a template
-     * 
-     * @param {number} templateId - Template ID
      */
-    async deleteAllVersions(templateId) {
-      strapi2.log.info(`[magic-mail] 🗑️  Deleting all versions for template ${templateId}`);
-      const template = await strapi2.entityService.findOne("plugin::magic-mail.email-template", templateId, {
+    async deleteAllVersions(templateDocumentId) {
+      strapi2.log.info(`[magic-mail] [DELETE]  Deleting all versions for template ${templateDocumentId}`);
+      const template = await strapi2.documents(EMAIL_TEMPLATE_UID).findOne({
+        documentId: templateDocumentId,
         populate: ["versions"]
       });
       if (!template) {
         throw new Error("Template not found");
       }
       const versionCount = template.versions?.length || 0;
-      strapi2.log.info(`[magic-mail] 📊 Found ${versionCount} versions to delete`);
       if (versionCount === 0) {
         return { success: true, message: "No versions to delete", deletedCount: 0 };
       }
       let deletedCount = 0;
-      const errors = [];
       for (const version2 of template.versions) {
         try {
-          await strapi2.entityService.delete("plugin::magic-mail.email-template-version", version2.id);
+          await strapi2.documents(EMAIL_TEMPLATE_VERSION_UID).delete({
+            documentId: version2.documentId
+          });
           deletedCount++;
-          strapi2.log.info(`[magic-mail] 🗑️  Deleted version #${version2.versionNumber} (ID: ${version2.id})`);
         } catch (error) {
-          strapi2.log.error(`[magic-mail] ❌ Failed to delete version ${version2.id}: ${error.message}`);
-          errors.push({ versionId: version2.id, error: error.message });
+          strapi2.log.error(`[magic-mail] [ERROR] Failed to delete version: ${error.message}`);
         }
       }
-      strapi2.log.info(`[magic-mail] ✅ Deleted ${deletedCount}/${versionCount} versions`);
-      return {
-        success: true,
-        message: `Deleted ${deletedCount} of ${versionCount} versions`,
-        deletedCount,
-        failedCount: versionCount - deletedCount,
-        errors: errors.length > 0 ? errors : void 0
-      };
+      strapi2.log.info(`[magic-mail] [SUCCESS] Deleted ${deletedCount}/${versionCount} versions`);
+      return { success: true, deletedCount };
     },
     // ============================================================
     // RENDERING
     // ============================================================
     /**
      * Render template with dynamic data using Mustache
-     * 
-     * @param {number} templateReferenceId - Template reference ID
-     * @param {object} data - Dynamic data for Mustache
-     * @returns {object} Rendered HTML, text, and subject
      */
     async renderTemplate(templateReferenceId, data = {}) {
       const template = await this.findByReferenceId(templateReferenceId);
@@ -5606,17 +5541,17 @@ function requireEmailDesigner() {
       };
     },
     // ============================================================
-    // IMPORT/EXPORT (Advanced+ License)
+    // IMPORT/EXPORT
     // ============================================================
     /**
      * Export templates as JSON
      */
-    async exportTemplates(templateIds = []) {
-      strapi2.log.info("[magic-mail] 📤 Exporting templates...");
+    async exportTemplates(templateDocumentIds = []) {
+      strapi2.log.info("[magic-mail] [EXPORT] Exporting templates...");
       let templates;
-      if (templateIds.length > 0) {
-        templates = await strapi2.entityService.findMany("plugin::magic-mail.email-template", {
-          filters: { id: { $in: templateIds } }
+      if (templateDocumentIds.length > 0) {
+        templates = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
+          filters: { documentId: { $in: templateDocumentIds } }
         });
       } else {
         templates = await this.findAll();
@@ -5631,26 +5566,24 @@ function requireEmailDesigner() {
         category: template.category,
         tags: template.tags
       }));
-      strapi2.log.info(`[magic-mail] ✅ Exported ${exported.length} templates`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Exported ${exported.length} templates`);
       return exported;
     },
     /**
      * Import templates from JSON
      */
     async importTemplates(templates) {
-      strapi2.log.info(`[magic-mail] 📥 Importing ${templates.length} templates...`);
+      strapi2.log.info(`[magic-mail] [IMPORT] Importing ${templates.length} templates...`);
       const results = [];
       for (const templateData of templates) {
         try {
           const existing = await this.findByReferenceId(templateData.templateReferenceId);
           if (existing) {
-            const updated = await this.update(existing.id, templateData);
+            const updated = await this.update(existing.documentId, templateData);
             results.push({ success: true, action: "updated", template: updated });
-            strapi2.log.info(`[magic-mail] ✅ Updated template: ${templateData.name}`);
           } else {
             const created = await this.create(templateData);
             results.push({ success: true, action: "created", template: created });
-            strapi2.log.info(`[magic-mail] ✅ Created template: ${templateData.name}`);
           }
         } catch (error) {
           results.push({
@@ -5659,11 +5592,8 @@ function requireEmailDesigner() {
             error: error.message,
             templateName: templateData.name
           });
-          strapi2.log.error(`[magic-mail] ❌ Failed to import ${templateData.name}: ${error.message}`);
         }
       }
-      const successful = results.filter((r) => r.success).length;
-      strapi2.log.info(`[magic-mail] ✅ Import completed: ${successful}/${templates.length} templates`);
       return results;
     },
     // ============================================================
@@ -5673,7 +5603,7 @@ function requireEmailDesigner() {
      * Get template statistics
      */
     async getStats() {
-      const allTemplates = await strapi2.entityService.findMany("plugin::magic-mail.email-template", {
+      const allTemplates = await strapi2.documents(EMAIL_TEMPLATE_UID).findMany({
         fields: ["isActive", "category"]
       });
       const total = allTemplates.length;
@@ -5698,9 +5628,7 @@ function requireEmailDesigner() {
     // STRAPI CORE EMAIL TEMPLATES
     // ============================================================
     /**
-     * Get Strapi core email template (reset-password, email-confirmation)
-     * 
-     * These are stored in users-permissions plugin store
+     * Get Strapi core email template
      */
     async getCoreTemplate(coreEmailType) {
       if (!["reset-password", "email-confirmation"].includes(coreEmailType)) {
@@ -5717,8 +5645,8 @@ function requireEmailDesigner() {
       if (emailConfig && emailConfig[pluginStoreEmailKey]) {
         data = emailConfig[pluginStoreEmailKey];
       }
-      const messageConverted = data && data.options && data.options.message ? data.options.message.replace(/<%|&#x3C;%/g, "{{").replace(/%>|%&#x3E;/g, "}}") : "";
-      const subjectConverted = data && data.options && data.options.object ? data.options.object.replace(/<%|&#x3C;%/g, "{{").replace(/%>|%&#x3E;/g, "}}") : "";
+      const messageConverted = data?.options?.message ? data.options.message.replace(/<%|&#x3C;%/g, "{{").replace(/%>|%&#x3E;/g, "}}") : "";
+      const subjectConverted = data?.options?.object ? data.options.object.replace(/<%|&#x3C;%/g, "{{").replace(/%>|%&#x3E;/g, "}}") : "";
       return {
         from: data?.options?.from || null,
         message: messageConverted || "",
@@ -5746,14 +5674,14 @@ function requireEmailDesigner() {
       emailsConfig[pluginStoreEmailKey] = {
         ...emailsConfig[pluginStoreEmailKey],
         options: {
-          ...emailsConfig[pluginStoreEmailKey] ? emailsConfig[pluginStoreEmailKey].options : {},
+          ...emailsConfig[pluginStoreEmailKey]?.options || {},
           message: data.message.replace(/{{/g, "<%").replace(/}}/g, "%>"),
           object: data.subject.replace(/{{/g, "<%").replace(/}}/g, "%>")
         },
         design: data.design
       };
       await pluginStore.set({ key: "email", value: emailsConfig });
-      strapi2.log.info(`[magic-mail] ✅ Core email template updated: ${pluginStoreEmailKey}`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Core email template updated: ${pluginStoreEmailKey}`);
       return { message: "Saved" };
     }
   });
@@ -5765,6 +5693,9 @@ function requireAnalytics() {
   if (hasRequiredAnalytics) return analytics;
   hasRequiredAnalytics = 1;
   const crypto = require$$0$1;
+  const EMAIL_LOG_UID = "plugin::magic-mail.email-log";
+  const EMAIL_EVENT_UID = "plugin::magic-mail.email-event";
+  const EMAIL_LINK_UID = "plugin::magic-mail.email-link";
   analytics = ({ strapi: strapi2 }) => ({
     /**
      * Generate unique email ID for tracking
@@ -5783,7 +5714,7 @@ function requireAnalytics() {
      */
     async createEmailLog(data) {
       const emailId = this.generateEmailId();
-      const logEntry = await strapi2.db.query("plugin::magic-mail.email-log").create({
+      const logEntry = await strapi2.documents(EMAIL_LOG_UID).create({
         data: {
           emailId,
           user: data.userId || null,
@@ -5798,9 +5729,9 @@ function requireAnalytics() {
           metadata: data.metadata || {}
         }
       });
-      strapi2.log.info(`[magic-mail] ✅ Email log created: ${emailId}`);
+      strapi2.log.info(`[magic-mail] [SUCCESS] Email log created: ${emailId}`);
       if (data.templateId) {
-        strapi2.log.info(`[magic-mail] 📋 Template tracked: ${data.templateName || "Unknown"} (ID: ${data.templateId})`);
+        strapi2.log.info(`[magic-mail] [INFO] Template tracked: ${data.templateName || "Unknown"} (ID: ${data.templateId})`);
       }
       return logEntry;
     },
@@ -5809,8 +5740,8 @@ function requireAnalytics() {
      */
     async recordOpen(emailId, recipientHash, req) {
       try {
-        const emailLog = await strapi2.db.query("plugin::magic-mail.email-log").findOne({
-          where: { emailId }
+        const emailLog = await strapi2.documents(EMAIL_LOG_UID).findFirst({
+          filters: { emailId }
         });
         if (!emailLog) {
           strapi2.log.warn(`[magic-mail] Email log not found: ${emailId}`);
@@ -5822,17 +5753,17 @@ function requireAnalytics() {
           return null;
         }
         const now = /* @__PURE__ */ new Date();
-        await strapi2.db.query("plugin::magic-mail.email-log").update({
-          where: { id: emailLog.id },
+        await strapi2.documents(EMAIL_LOG_UID).update({
+          documentId: emailLog.documentId,
           data: {
-            openCount: emailLog.openCount + 1,
+            openCount: (emailLog.openCount || 0) + 1,
             firstOpenedAt: emailLog.firstOpenedAt || now,
             lastOpenedAt: now
           }
         });
-        const event = await strapi2.db.query("plugin::magic-mail.email-event").create({
+        const event = await strapi2.documents(EMAIL_EVENT_UID).create({
           data: {
-            emailLog: emailLog.id,
+            emailLog: emailLog.documentId,
             type: "open",
             timestamp: now,
             ipAddress: req.ip || req.headers["x-forwarded-for"] || null,
@@ -5840,7 +5771,7 @@ function requireAnalytics() {
             location: this.parseLocation(req)
           }
         });
-        strapi2.log.info(`[magic-mail] 📧 Email opened: ${emailId} (count: ${emailLog.openCount + 1})`);
+        strapi2.log.info(`[magic-mail] [EMAIL] Email opened: ${emailId} (count: ${(emailLog.openCount || 0) + 1})`);
         return event;
       } catch (error) {
         strapi2.log.error("[magic-mail] Error recording open:", error);
@@ -5852,8 +5783,8 @@ function requireAnalytics() {
      */
     async recordClick(emailId, linkHash, recipientHash, targetUrl, req) {
       try {
-        const emailLog = await strapi2.db.query("plugin::magic-mail.email-log").findOne({
-          where: { emailId }
+        const emailLog = await strapi2.documents(EMAIL_LOG_UID).findFirst({
+          filters: { emailId }
         });
         if (!emailLog) {
           return null;
@@ -5863,15 +5794,15 @@ function requireAnalytics() {
           return null;
         }
         const now = /* @__PURE__ */ new Date();
-        await strapi2.db.query("plugin::magic-mail.email-log").update({
-          where: { id: emailLog.id },
+        await strapi2.documents(EMAIL_LOG_UID).update({
+          documentId: emailLog.documentId,
           data: {
-            clickCount: emailLog.clickCount + 1
+            clickCount: (emailLog.clickCount || 0) + 1
           }
         });
-        const event = await strapi2.db.query("plugin::magic-mail.email-event").create({
+        const event = await strapi2.documents(EMAIL_EVENT_UID).create({
           data: {
-            emailLog: emailLog.id,
+            emailLog: emailLog.documentId,
             type: "click",
             timestamp: now,
             ipAddress: req.ip || req.headers["x-forwarded-for"] || null,
@@ -5880,7 +5811,7 @@ function requireAnalytics() {
             linkUrl: targetUrl
           }
         });
-        strapi2.log.info(`[magic-mail] 🖱️  Link clicked: ${emailId} → ${targetUrl}`);
+        strapi2.log.info(`[magic-mail] [CLICK] Link clicked: ${emailId} -> ${targetUrl}`);
         return event;
       } catch (error) {
         strapi2.log.error("[magic-mail] Error recording click:", error);
@@ -5889,34 +5820,37 @@ function requireAnalytics() {
     },
     /**
      * Get analytics statistics
+     * Note: Document Service doesn't have count() - using findMany for counting
      */
     async getStats(filters = {}) {
-      const where = {};
+      const baseFilters = {};
       if (filters.userId) {
-        where.user = filters.userId;
+        baseFilters.user = { documentId: filters.userId };
       }
       if (filters.templateId) {
-        where.templateId = filters.templateId;
+        baseFilters.templateId = filters.templateId;
       }
       if (filters.accountId) {
-        where.accountId = filters.accountId;
+        baseFilters.accountId = filters.accountId;
       }
       if (filters.dateFrom) {
-        where.sentAt = { $gte: new Date(filters.dateFrom) };
+        baseFilters.sentAt = { $gte: new Date(filters.dateFrom) };
       }
       if (filters.dateTo) {
-        where.sentAt = { ...where.sentAt, $lte: new Date(filters.dateTo) };
+        baseFilters.sentAt = { ...baseFilters.sentAt, $lte: new Date(filters.dateTo) };
       }
       const [totalSent, totalOpened, totalClicked, totalBounced] = await Promise.all([
-        strapi2.db.query("plugin::magic-mail.email-log").count({ where }),
-        strapi2.db.query("plugin::magic-mail.email-log").count({
-          where: { ...where, openCount: { $gt: 0 } }
+        strapi2.documents(EMAIL_LOG_UID).count({
+          filters: baseFilters
         }),
-        strapi2.db.query("plugin::magic-mail.email-log").count({
-          where: { ...where, clickCount: { $gt: 0 } }
+        strapi2.documents(EMAIL_LOG_UID).count({
+          filters: { ...baseFilters, openCount: { $gt: 0 } }
         }),
-        strapi2.db.query("plugin::magic-mail.email-log").count({
-          where: { ...where, bounced: true }
+        strapi2.documents(EMAIL_LOG_UID).count({
+          filters: { ...baseFilters, clickCount: { $gt: 0 } }
+        }),
+        strapi2.documents(EMAIL_LOG_UID).count({
+          filters: { ...baseFilters, bounced: true }
         })
       ]);
       const openRate = totalSent > 0 ? totalOpened / totalSent * 100 : 0;
@@ -5938,7 +5872,7 @@ function requireAnalytics() {
     async getEmailLogs(filters = {}, pagination = {}) {
       const where = {};
       if (filters.userId) {
-        where.user = filters.userId;
+        where.user = { documentId: filters.userId };
       }
       if (filters.templateId) {
         where.templateId = filters.templateId;
@@ -5953,14 +5887,17 @@ function requireAnalytics() {
       const page = pagination.page || 1;
       const pageSize = pagination.pageSize || 25;
       const [logs, total] = await Promise.all([
-        strapi2.db.query("plugin::magic-mail.email-log").findMany({
-          where,
-          orderBy: { sentAt: "desc" },
+        strapi2.documents(EMAIL_LOG_UID).findMany({
+          filters: where,
+          sort: [{ sentAt: "desc" }],
           limit: pageSize,
           offset: (page - 1) * pageSize,
           populate: ["user"]
         }),
-        strapi2.db.query("plugin::magic-mail.email-log").count({ where })
+        // Get total count using native count() method
+        strapi2.documents(EMAIL_LOG_UID).count({
+          filters: where
+        })
       ]);
       return {
         data: logs,
@@ -5976,8 +5913,8 @@ function requireAnalytics() {
      * Get email log details with events
      */
     async getEmailLogDetails(emailId) {
-      const emailLog = await strapi2.db.query("plugin::magic-mail.email-log").findOne({
-        where: { emailId },
+      const emailLog = await strapi2.documents(EMAIL_LOG_UID).findFirst({
+        filters: { emailId },
         populate: ["user", "events"]
       });
       return emailLog;
@@ -5986,9 +5923,9 @@ function requireAnalytics() {
      * Get user email activity
      */
     async getUserActivity(userId) {
-      const emailLogs = await strapi2.db.query("plugin::magic-mail.email-log").findMany({
-        where: { user: userId },
-        orderBy: { sentAt: "desc" },
+      const emailLogs = await strapi2.documents(EMAIL_LOG_UID).findMany({
+        filters: { user: { documentId: userId } },
+        sort: [{ sentAt: "desc" }],
         limit: 50
       });
       const stats = await this.getStats({ userId });
@@ -6026,8 +5963,8 @@ function requireAnalytics() {
      */
     async rewriteLinksForTracking(html, emailId, recipientHash) {
       const baseUrl = strapi2.config.get("server.url") || "http://localhost:1337";
-      const emailLog = await strapi2.db.query("plugin::magic-mail.email-log").findOne({
-        where: { emailId }
+      const emailLog = await strapi2.documents(EMAIL_LOG_UID).findFirst({
+        filters: { emailId }
       });
       if (!emailLog) {
         strapi2.log.error(`[magic-mail] Cannot rewrite links: Email log not found for ${emailId}`);
@@ -6041,13 +5978,13 @@ function requireAnalytics() {
       while ((match = linkRegex.exec(html)) !== null) {
         match[0];
         const originalUrl = match[1];
-        strapi2.log.debug(`[magic-mail] 🔍 Found link: ${originalUrl.substring(0, 100)}${originalUrl.length > 100 ? "..." : ""}`);
+        strapi2.log.debug(`[magic-mail] [CHECK] Found link: ${originalUrl.substring(0, 100)}${originalUrl.length > 100 ? "..." : ""}`);
         if (originalUrl.startsWith("#") || originalUrl.includes("/track/click/")) {
-          strapi2.log.debug(`[magic-mail] ⏭️  Skipping (anchor or already tracked)`);
+          strapi2.log.debug(`[magic-mail] [SKIP] Skipping (anchor or already tracked)`);
           continue;
         }
         if (!originalUrl.match(/^https?:\/\//i) && !originalUrl.startsWith("/")) {
-          strapi2.log.debug(`[magic-mail] ⏭️  Skipping relative URL: ${originalUrl}`);
+          strapi2.log.debug(`[magic-mail] [SKIP] Skipping relative URL: ${originalUrl}`);
           continue;
         }
         const linkHash = crypto.createHash("md5").update(originalUrl).digest("hex").substring(0, 8);
@@ -6057,7 +5994,7 @@ function requireAnalytics() {
         });
         const trackingUrl = `${baseUrl}/api/magic-mail/track/click/${emailId}/${linkHash}/${recipientHash}`;
         linkCount++;
-        strapi2.log.info(`[magic-mail] 🔗 Link ${linkCount}: ${originalUrl} → ${trackingUrl}`);
+        strapi2.log.info(`[magic-mail] [LINK] Link ${linkCount}: ${originalUrl} → ${trackingUrl}`);
         replacements.push({
           from: originalUrl,
           to: trackingUrl
@@ -6065,7 +6002,7 @@ function requireAnalytics() {
       }
       for (const mapping of linkMappings) {
         try {
-          await this.storeLinkMapping(emailLog.id, mapping.linkHash, mapping.originalUrl);
+          await this.storeLinkMapping(emailLog.documentId, mapping.linkHash, mapping.originalUrl);
         } catch (err) {
           strapi2.log.error("[magic-mail] Error storing link mapping:", err);
         }
@@ -6075,20 +6012,20 @@ function requireAnalytics() {
         result = result.replace(replacement.from, replacement.to);
       }
       if (linkCount > 0) {
-        strapi2.log.info(`[magic-mail] ✅ Rewrote ${linkCount} links for click tracking`);
+        strapi2.log.info(`[magic-mail] [SUCCESS] Rewrote ${linkCount} links for click tracking`);
       } else {
-        strapi2.log.warn(`[magic-mail] ⚠️  No links found in email HTML for tracking!`);
+        strapi2.log.warn(`[magic-mail] [WARNING]  No links found in email HTML for tracking!`);
       }
       return result;
     },
     /**
      * Store link mapping in database
      */
-    async storeLinkMapping(emailLogId, linkHash, originalUrl) {
+    async storeLinkMapping(emailLogDocId, linkHash, originalUrl) {
       try {
-        const existing = await strapi2.db.query("plugin::magic-mail.email-link").findOne({
-          where: {
-            emailLog: emailLogId,
+        const existing = await strapi2.documents(EMAIL_LINK_UID).findFirst({
+          filters: {
+            emailLog: { documentId: emailLogDocId },
             linkHash
           }
         });
@@ -6096,15 +6033,15 @@ function requireAnalytics() {
           strapi2.log.debug(`[magic-mail] Link mapping already exists for ${linkHash}`);
           return existing;
         }
-        const linkMapping = await strapi2.db.query("plugin::magic-mail.email-link").create({
+        const linkMapping = await strapi2.documents(EMAIL_LINK_UID).create({
           data: {
-            emailLog: emailLogId,
+            emailLog: emailLogDocId,
             linkHash,
             originalUrl,
             clickCount: 0
           }
         });
-        strapi2.log.debug(`[magic-mail] 💾 Stored link mapping: ${linkHash} → ${originalUrl}`);
+        strapi2.log.debug(`[magic-mail] [SAVE] Stored link mapping: ${linkHash} → ${originalUrl}`);
         return linkMapping;
       } catch (error) {
         strapi2.log.error("[magic-mail] Error storing link mapping:", error);
@@ -6116,16 +6053,16 @@ function requireAnalytics() {
      */
     async getOriginalUrlFromHash(emailId, linkHash) {
       try {
-        const emailLog = await strapi2.db.query("plugin::magic-mail.email-log").findOne({
-          where: { emailId }
+        const emailLog = await strapi2.documents(EMAIL_LOG_UID).findFirst({
+          filters: { emailId }
         });
         if (!emailLog) {
           strapi2.log.warn(`[magic-mail] Email log not found: ${emailId}`);
           return null;
         }
-        const linkMapping = await strapi2.db.query("plugin::magic-mail.email-link").findOne({
-          where: {
-            emailLog: emailLog.id,
+        const linkMapping = await strapi2.documents(EMAIL_LINK_UID).findFirst({
+          filters: {
+            emailLog: { documentId: emailLog.documentId },
             linkHash
           }
         });
@@ -6134,10 +6071,10 @@ function requireAnalytics() {
           return null;
         }
         const now = /* @__PURE__ */ new Date();
-        await strapi2.db.query("plugin::magic-mail.email-link").update({
-          where: { id: linkMapping.id },
+        await strapi2.documents(EMAIL_LINK_UID).update({
+          documentId: linkMapping.documentId,
           data: {
-            clickCount: linkMapping.clickCount + 1,
+            clickCount: (linkMapping.clickCount || 0) + 1,
             firstClickedAt: linkMapping.firstClickedAt || now,
             lastClickedAt: now
           }