diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 1a213305..299e5ef3 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs
index 9faf1660..1468c18b 100644
--- a/Step.Core/ThreadsFunctions.cs
+++ b/Step.Core/ThreadsFunctions.cs
@@ -805,9 +805,9 @@ public static class ThreadsFunctions
                 ReadAlarmsTimes = 0;
             }
 
-            if (ThreadsHandler.RunningThreadStatus.ContainsKey("ReadAxes") && ReadAxesTimes != 0)
+            if (ThreadsHandler.RunningThreadStatus.ContainsKey("ReadAxesPositionsData") && ReadAxesTimes != 0)
             {
-                ThreadsHandler.RunningThreadStatus["ReadAxes"] = (ReadAxesTimer / ReadAxesTimes) + " mS";
+                ThreadsHandler.RunningThreadStatus["ReadAxesPositionsData"] = (ReadAxesTimer / ReadAxesTimes) + " mS";
                 ReadAxesTimer = 0;
                 ReadAxesTimes = 0;
             }
diff --git a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
index 3ffe525d..84b8189b 100644
--- a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs
@@ -61,6 +61,21 @@ namespace Step.Model.DTOModels.ToolModels
 
         [Required]
         public bool PreAlarm { get; set; }
+        // Custom fields
+        [Required]
+        public int Load { get; set; }
+
+        [Required]
+        public int Gamma { get; set; }
+
+        [Required]
+        public int MaxLoadPctAutoload { get; set; }
+
+        [Required]
+        public int MinLoadPctAutoload { get; set; }
+
+        [Required]
+        public int ToolTypeCode { get; set; }
 
         public DTONcShankModel Shank { get; set; }
 
@@ -87,7 +102,13 @@ namespace Step.Model.DTOModels.ToolModels
                 Cooling2 = dtoModel.Cooling2,
                 LeftSize = dtoModel.LeftSize,
                 RightSize = dtoModel.RightSize,
-                Rotation = dtoModel.Rotation
+                Rotation = dtoModel.Rotation,
+
+                Load = dtoModel.Load,
+                Gamma = dtoModel.Gamma,
+                MaxLoadPctAutoload = dtoModel.MaxLoadPctAutoload,
+                MinLoadPctAutoload = dtoModel.MinLoadPctAutoload,
+                ToolTypeCode = dtoModel.ToolTypeCode
             };
         }
     }
diff --git a/Step/Controllers/WebApi/ApiAlarmController.cs b/Step/Controllers/WebApi/ApiAlarmController.cs
index 462dce5f..7339ad19 100644
--- a/Step/Controllers/WebApi/ApiAlarmController.cs
+++ b/Step/Controllers/WebApi/ApiAlarmController.cs
@@ -54,7 +54,7 @@ namespace Step.Controllers.WebApi
         #region Note
 
         [Route("{alarmDescId:int}/note"), HttpGet]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.READ)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.READ)]
         public IHttpActionResult GetAlarmNotes(int alarmDescId)
         {
             if (!ModelState.IsValid)
@@ -75,7 +75,7 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("{alarmDescId:int}/note"), HttpPost]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.USER_FUNCTIONS, Action = ACTIONS.WRITE)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.WRITE)]
         public IHttpActionResult AddAlarmNote(int alarmDescId, DTONewAlarmNoteModel note)
         {
             if (!ModelState.IsValid)
@@ -100,7 +100,7 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("{alarmDescId:int}/note/{noteId:int}"), HttpPut]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.WRITE)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.WRITE)]
         public IHttpActionResult EditAlarmNote(int noteId, DTONewAlarmNoteModel newNote)
         {
             if (!ModelState.IsValid)
@@ -129,7 +129,7 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("{alarmDescId:int}/note/{noteId:int}"), HttpDelete]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.WRITE)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.WRITE)]
         public IHttpActionResult DeleteAlarmNote(int noteId)
         {
             if (!ModelState.IsValid)
@@ -162,7 +162,7 @@ namespace Step.Controllers.WebApi
         #region Attachment
 
         [Route("{alarmDescId:int}/attachments"), HttpGet]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.READ)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.READ)]
         public IHttpActionResult GetAttachmentsByAlarmId(int alarmDescId)
         {
             using (AlarmsController alarmsController = new AlarmsController())
@@ -195,7 +195,7 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("{alarmDescId:int}/attachment"), HttpPost]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.WRITE)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.WRITE)]
         public async Task<IHttpActionResult> AddAttachment(int alarmDescId)
         {
             var identity = User.Identity as ClaimsIdentity;
@@ -236,7 +236,7 @@ namespace Step.Controllers.WebApi
         }
 
         [Route("attachment/{attachmentId:int}"), HttpDelete]
-        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.MAINTENANCE, Action = ACTIONS.WRITE)]
+        [WebApiAuthorize(FunctionAccess = FUNCTIONALITY_NAMES.ALARM_CMD, Action = ACTIONS.WRITE)]
         public IHttpActionResult DeleteAttachment(int attachmentId)
         {
             var identity = User.Identity as ClaimsIdentity;