diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
index eeddd42..bc2bd3a 100644
--- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
+++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs
@@ -3072,7 +3072,7 @@ namespace CMS_CORE_Library.Fanuc
             int status = 0;
             cmsError = MEM_RWInteger(R, 0, MAGAZINES_ENABLED_CMD.MemType, MAGAZINES_ENABLED_CMD.Address, ref status);
             if (cmsError.IsError())
-                return cmsError;
+                return cmsError;    
 
             bool[] bits = IntToBits(status);
 
@@ -3521,7 +3521,7 @@ namespace CMS_CORE_Library.Fanuc
             }
         }
 
-        //Convert to Step Language
+        // Convert to Step Language
         private CultureInfo ConvertToSTEPLanguage(byte language)
         {
             switch (language)
diff --git a/CMS_CORE_Library/ToolConfigurations.cs b/CMS_CORE_Library/ToolConfigurations.cs
index 99009d9..763da7f 100644
--- a/CMS_CORE_Library/ToolConfigurations.cs
+++ b/CMS_CORE_Library/ToolConfigurations.cs
@@ -274,10 +274,12 @@ namespace CMS_CORE_Library
             ShankConfiguration = new List<FieldsConfiguration>()
             {
                 new FieldsConfiguration{ Name = "id",                    Type = "int",         SelectValues = null,      Category = "general",      ReadOnly = true,    MinValue = 0, MaxValue = 0 },
-                new FieldsConfiguration{ Name = "balluf",                Type = "int",         SelectValues = null,      Category = "balluf",     ReadOnly = false,   MinValue = 0, MaxValue = (uint)short.MaxValue },
-                new FieldsConfiguration{ Name = "magazinePositionType",  Type = "int",         SelectValues = null,      Category = "magPosType",     ReadOnly = false,   MinValue = 0, MaxValue = byte.MaxValue },
+                new FieldsConfiguration{ Name = "balluf",                Type = "int",         SelectValues = null,      Category = "balluf",       ReadOnly = false,   MinValue = 0, MaxValue = (uint)short.MaxValue },
+                new FieldsConfiguration{ Name = "magazinePositionType",  Type = "int",         SelectValues = null,      Category = "magPosType",   ReadOnly = false,   MinValue = 0, MaxValue = byte.MaxValue },
                 new FieldsConfiguration{ Name = "magazineId",            Type = "int",         SelectValues = null,      Category = "position",     ReadOnly = true,   MinValue = 0, MaxValue = byte.MaxValue },
-                new FieldsConfiguration{ Name = "positionId",            Type = "int",         SelectValues = null,      Category = "position",     ReadOnly = true,   MinValue = 0, MaxValue = byte.MaxValue }
+                new FieldsConfiguration{ Name = "positionId",            Type = "int",         SelectValues = null,      Category = "position",     ReadOnly = true,   MinValue = 0, MaxValue = byte.MaxValue },
+                new FieldsConfiguration{ Name = "originMagazineId",      Type = "int",         SelectValues = null,      Category = "position",     ReadOnly = true,   MinValue = 0, MaxValue = byte.MaxValue },
+                new FieldsConfiguration{ Name = "originPositionId",      Type = "int",         SelectValues = null,      Category = "position",     ReadOnly = true,   MinValue = 0, MaxValue = byte.MaxValue }
             },
             ToolsConfiguration = new List<FieldsConfiguration>()
             {