diff --git a/cli/Program.cs b/cli/Program.cs
index 454dd10d..34bcb94c 100644
--- a/cli/Program.cs
+++ b/cli/Program.cs
@@ -49,7 +49,7 @@ namespace cli
 
             var app = hostengnine.Start();
             var mailer = app.Services.GetService<EMailer>();
-            mailer.AllUserGen(2);
+            mailer.AllUserGen(2, nameof(UserOrientedTemplate));
         }
     }
 }
diff --git a/cli/Services/EMailer.cs b/cli/Services/EMailer.cs
index 3035b250..7b5307d1 100644
--- a/cli/Services/EMailer.cs
+++ b/cli/Services/EMailer.cs
@@ -66,9 +66,10 @@ namespace cli.Services
       
       
     }
-    public void AllUserGen(long templateCode)
+    public void AllUserGen(long templateCode, string baseclassName = DefaultClassName)
     {
-      string className = DefaultClassName;
+      string className = "Generated"+baseclassName;
+
       string subtemp = stringLocalizer["MonthlySubjectTemplate"].Value;
 
       logger.LogInformation($"Generating {subtemp}[{className}]");
@@ -131,6 +132,7 @@ namespace cli.Services
                     foreach (Diagnostic diagnostic in failures)
                     {
                         logger.LogCritical("{0}: {1}", diagnostic.Id, diagnostic.GetMessage());
+                        logger.LogDebug("{0}: {1}", diagnostic.Id, diagnostic.Location.GetLineSpan());
                     }
                 }
                 else