Changes Sensors Table to IOS.

Added IO TYPE field for IOS Table.

11 files changed, 244 insertions, 123 deletions

diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/BRUSH_STOPS.cs
index 0aac9e9d8..d6012da5d 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/BRUSH_STOPS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/BRUSH_STOPS.cs
@@ -20,6 +20,7 @@ namespace Tango.DAL.Local.DB
         public string SEGMENT_GUID { get; set; }
         public string COLOR_SPACE_GUID { get; set; }
         public double OFFSET_PERCENT { get; set; }
+        public long STOP_INDEX { get; set; }
         public double CYAN { get; set; }
         public double MAGENTA { get; set; }
         public double YELLOW { get; set; }
@@ -27,9 +28,17 @@ namespace Tango.DAL.Local.DB
         public long RED { get; set; }
         public long GREEN { get; set; }
         public long BLUE { get; set; }
-        public long L { get; set; }
-        public long A { get; set; }
-        public long B { get; set; }
+        public double L { get; set; }
+        public double A { get; set; }
+        public double B { get; set; }
+        public double V0 { get; set; }
+        public double V1 { get; set; }
+        public double V2 { get; set; }
+        public double V3 { get; set; }
+        public double V4 { get; set; }
+        public double V5 { get; set; }
+        public double V6 { get; set; }
+        public double V7 { get; set; }
         public string PANTON_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
index 8da598c46..d35628b2c 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACKS.cs
@@ -24,5 +24,6 @@ namespace Tango.DAL.Local.DB
         public string MID_TANK_TYPE_GUID { get; set; }
         public string NAME { get; set; }
         public long PACK_INDEX { get; set; }
+        public string IDS_PACK_FORMULA_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACK_FORMULAS.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACK_FORMULAS.cs
new file mode 100644
index 000000000..872155619
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IDS_PACK_FORMULAS.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class IDS_PACK_FORMULAS
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public long CODE { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public bool AUTO_CALCULATED { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/SENSOR.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/IO.cs
index 52684215f..04d170673 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/SENSOR.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/IO.cs
@@ -12,12 +12,13 @@ namespace Tango.DAL.Local.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class SENSOR
+    public partial class IO
     {
         public long ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public long CODE { get; set; }
+        public long TYPE { get; set; }
         public string NAME { get; set; }
         public string DESCRIPTION { get; set; }
         public double MIN { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/JOB.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/JOB.cs
index 8b4f27fa5..5bf3adae8 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/JOB.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/JOB.cs
@@ -26,5 +26,6 @@ namespace Tango.DAL.Local.DB
         public double INTER_SEGMENT_LENGTH { get; set; }
         public bool ENABLE_INTER_SEGMENT { get; set; }
         public bool ENABLE_LUBRICATION { get; set; }
+        public long JOB_INDEX { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 0dffbab6c..a6bf21cc9 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -46,7 +46,9 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<FIBER_SHAPES> FIBER_SHAPES { get; set; }
         public virtual DbSet<FIBER_SYNTHS> FIBER_SYNTHS { get; set; }
         public virtual DbSet<HARDWARE_VERSIONS> HARDWARE_VERSIONS { get; set; }
+        public virtual DbSet<IDS_PACK_FORMULAS> IDS_PACK_FORMULAS { get; set; }
         public virtual DbSet<IDS_PACKS> IDS_PACKS { get; set; }
+        public virtual DbSet<IO> IOS { get; set; }
         public virtual DbSet<JOB_RUNS> JOB_RUNS { get; set; }
         public virtual DbSet<JOB> JOBS { get; set; }
         public virtual DbSet<LINEAR_MASS_DENSITY_UNITS> LINEAR_MASS_DENSITY_UNITS { get; set; }
@@ -69,7 +71,6 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
         public virtual DbSet<SEGMENT> SEGMENTS { get; set; }
-        public virtual DbSet<SENSOR> SENSORS { get; set; }
         public virtual DbSet<SYNC_CONFIGURATIONS> SYNC_CONFIGURATIONS { get; set; }
         public virtual DbSet<USER> USERS { get; set; }
         public virtual DbSet<USERS_ROLES> USERS_ROLES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 23fbed26c..fcfd1cb56 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -82,6 +82,7 @@
           <Property Name="SEGMENT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="COLOR_SPACE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="OFFSET_PERCENT" Type="real" Nullable="false" />
+          <Property Name="STOP_INDEX" Type="integer" Nullable="false" />
           <Property Name="CYAN" Type="real" Nullable="false" />
           <Property Name="MAGENTA" Type="real" Nullable="false" />
           <Property Name="YELLOW" Type="real" Nullable="false" />
@@ -89,9 +90,17 @@
           <Property Name="RED" Type="integer" Nullable="false" />
           <Property Name="GREEN" Type="integer" Nullable="false" />
           <Property Name="BLUE" Type="integer" Nullable="false" />
-          <Property Name="L" Type="integer" Nullable="false" />
-          <Property Name="A" Type="integer" Nullable="false" />
-          <Property Name="B" Type="integer" Nullable="false" />
+          <Property Name="L" Type="real" Nullable="false" />
+          <Property Name="A" Type="real" Nullable="false" />
+          <Property Name="B" Type="real" Nullable="false" />
+          <Property Name="V0" Type="real" Nullable="false" />
+          <Property Name="V1" Type="real" Nullable="false" />
+          <Property Name="V2" Type="real" Nullable="false" />
+          <Property Name="V3" Type="real" Nullable="false" />
+          <Property Name="V4" Type="real" Nullable="false" />
+          <Property Name="V5" Type="real" Nullable="false" />
+          <Property Name="V6" Type="real" Nullable="false" />
+          <Property Name="V7" Type="real" Nullable="false" />
           <Property Name="PANTON_GUID" Type="varchar" MaxLength="36" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
@@ -258,6 +267,18 @@
           <Property Name="VERSION" Type="real" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
         </EntityType>
+        <EntityType Name="IDS_PACK_FORMULAS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="AUTO_CALCULATED" Type="bit" Nullable="false" />
+        </EntityType>
         <EntityType Name="IDS_PACKS">
           <Key>
             <PropertyRef Name="ID" />
@@ -272,6 +293,25 @@
           <Property Name="MID_TANK_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="PACK_INDEX" Type="integer" Nullable="false" />
+          <Property Name="IDS_PACK_FORMULA_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
+        <EntityType Name="IOS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
+          <Property Name="CODE" Type="integer" Nullable="false" />
+          <Property Name="TYPE" Type="integer" Nullable="false" />
+          <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
+          <Property Name="MIN" Type="real" Nullable="false" />
+          <Property Name="MAX" Type="real" Nullable="false" />
+          <Property Name="UNITS" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="POINTS_PER_FRAME" Type="integer" Nullable="false" />
+          <Property Name="MULTI_CHANNEL" Type="bit" Nullable="false" />
+          <Property Name="CHANNEL_COUNT" Type="integer" Nullable="false" />
         </EntityType>
         <EntityType Name="JOB_RUNS">
           <Key>
@@ -301,6 +341,7 @@
           <Property Name="INTER_SEGMENT_LENGTH" Type="real" Nullable="false" />
           <Property Name="ENABLE_INTER_SEGMENT" Type="bit" Nullable="false" />
           <Property Name="ENABLE_LUBRICATION" Type="bit" Nullable="false" />
+          <Property Name="JOB_INDEX" Type="integer" Nullable="false" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
@@ -503,10 +544,10 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="MANUFACTURER" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="CODE" Type="integer" Nullable="false" />
-          <Property Name="MATERIAL_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="COLOR_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="PURPOSE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="CONDITION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MEDIA_MATERIAL_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MEDIA_COLOR_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MEDIA_PURPOSE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MEDIA_CONDITION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LINEAR_MASS_DENSITY_UNIT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="FIBER_SHAPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="FIBER_SYNTH_GUID" Type="varchar" MaxLength="36" Nullable="false" />
@@ -552,23 +593,7 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="JOB_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="LENGTH" Type="real" Nullable="false" />
-        </EntityType>
-        <EntityType Name="SENSORS">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="integer" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
-          <Property Name="CODE" Type="integer" Nullable="false" />
-          <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" />
-          <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" />
-          <Property Name="MIN" Type="real" Nullable="false" />
-          <Property Name="MAX" Type="real" Nullable="false" />
-          <Property Name="UNITS" Type="nvarchar" MaxLength="50" Nullable="false" />
-          <Property Name="POINTS_PER_FRAME" Type="integer" Nullable="false" />
-          <Property Name="MULTI_CHANNEL" Type="bit" Nullable="false" />
-          <Property Name="CHANNEL_COUNT" Type="integer" Nullable="false" />
+          <Property Name="SEGMENT_INDEX" Type="integer" Nullable="false" />
         </EntityType>
         <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
@@ -636,7 +661,9 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="Self.FIBER_SHAPES" store:Type="Tables" />
           <EntitySet Name="FIBER_SYNTHS" EntityType="Self.FIBER_SYNTHS" store:Type="Tables" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="Self.HARDWARE_VERSIONS" store:Type="Tables" />
+          <EntitySet Name="IDS_PACK_FORMULAS" EntityType="Self.IDS_PACK_FORMULAS" store:Type="Tables" />
           <EntitySet Name="IDS_PACKS" EntityType="Self.IDS_PACKS" store:Type="Tables" />
+          <EntitySet Name="IOS" EntityType="Self.IOS" store:Type="Tables" />
           <EntitySet Name="JOB_RUNS" EntityType="Self.JOB_RUNS" store:Type="Tables" />
           <EntitySet Name="JOBS" EntityType="Self.JOBS" store:Type="Tables" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="Self.LINEAR_MASS_DENSITY_UNITS" store:Type="Tables" />
@@ -659,7 +686,6 @@
           <EntitySet Name="ROLES" EntityType="Self.ROLES" store:Type="Tables" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" store:Type="Tables" />
           <EntitySet Name="SEGMENTS" EntityType="Self.SEGMENTS" store:Type="Tables" />
-          <EntitySet Name="SENSORS" EntityType="Self.SENSORS" store:Type="Tables" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" store:Type="Tables" />
           <EntitySet Name="USERS" EntityType="Self.USERS" store:Type="Tables" />
           <EntitySet Name="USERS_ROLES" EntityType="Self.USERS_ROLES" store:Type="Tables" />
@@ -691,7 +717,9 @@
           <EntitySet Name="FIBER_SHAPES" EntityType="LocalModel.FIBER_SHAPES" />
           <EntitySet Name="FIBER_SYNTHS" EntityType="LocalModel.FIBER_SYNTHS" />
           <EntitySet Name="HARDWARE_VERSIONS" EntityType="LocalModel.HARDWARE_VERSIONS" />
+          <EntitySet Name="IDS_PACK_FORMULAS" EntityType="LocalModel.IDS_PACK_FORMULAS" />
           <EntitySet Name="IDS_PACKS" EntityType="LocalModel.IDS_PACKS" />
+          <EntitySet Name="IOS" EntityType="LocalModel.IO" />
           <EntitySet Name="JOB_RUNS" EntityType="LocalModel.JOB_RUNS" />
           <EntitySet Name="JOBS" EntityType="LocalModel.JOB" />
           <EntitySet Name="LINEAR_MASS_DENSITY_UNITS" EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" />
@@ -714,7 +742,6 @@
           <EntitySet Name="ROLES" EntityType="LocalModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="LocalModel.ROLES_PERMISSIONS" />
           <EntitySet Name="SEGMENTS" EntityType="LocalModel.SEGMENT" />
-          <EntitySet Name="SENSORS" EntityType="LocalModel.SENSOR" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="LocalModel.SYNC_CONFIGURATIONS" />
           <EntitySet Name="USERS" EntityType="LocalModel.USER" />
           <EntitySet Name="USERS_ROLES" EntityType="LocalModel.USERS_ROLES" />
@@ -797,6 +824,7 @@
           <Property Name="SEGMENT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="COLOR_SPACE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="OFFSET_PERCENT" Type="Double" Nullable="false" />
+          <Property Name="STOP_INDEX" Type="Int64" Nullable="false" />
           <Property Name="CYAN" Type="Double" Nullable="false" />
           <Property Name="MAGENTA" Type="Double" Nullable="false" />
           <Property Name="YELLOW" Type="Double" Nullable="false" />
@@ -804,9 +832,17 @@
           <Property Name="RED" Type="Int64" Nullable="false" />
           <Property Name="GREEN" Type="Int64" Nullable="false" />
           <Property Name="BLUE" Type="Int64" Nullable="false" />
-          <Property Name="L" Type="Int64" Nullable="false" />
-          <Property Name="A" Type="Int64" Nullable="false" />
-          <Property Name="B" Type="Int64" Nullable="false" />
+          <Property Name="L" Type="Double" Nullable="false" />
+          <Property Name="A" Type="Double" Nullable="false" />
+          <Property Name="B" Type="Double" Nullable="false" />
+          <Property Name="V0" Type="Double" Nullable="false" />
+          <Property Name="V1" Type="Double" Nullable="false" />
+          <Property Name="V2" Type="Double" Nullable="false" />
+          <Property Name="V3" Type="Double" Nullable="false" />
+          <Property Name="V4" Type="Double" Nullable="false" />
+          <Property Name="V5" Type="Double" Nullable="false" />
+          <Property Name="V6" Type="Double" Nullable="false" />
+          <Property Name="V7" Type="Double" Nullable="false" />
           <Property Name="PANTON_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
@@ -973,6 +1009,18 @@
           <Property Name="VERSION" Type="Double" Nullable="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
         </EntityType>
+        <EntityType Name="IDS_PACK_FORMULAS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="AUTO_CALCULATED" Type="Boolean" Nullable="false" />
+        </EntityType>
         <EntityType Name="IDS_PACKS">
           <Key>
             <PropertyRef Name="ID" />
@@ -987,6 +1035,25 @@
           <Property Name="MID_TANK_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="PACK_INDEX" Type="Int64" Nullable="false" />
+          <Property Name="IDS_PACK_FORMULA_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+        </EntityType>
+        <EntityType Name="IO">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
+          <Property Name="CODE" Type="Int64" Nullable="false" />
+          <Property Name="TYPE" Type="Int64" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
+          <Property Name="MIN" Type="Double" Nullable="false" />
+          <Property Name="MAX" Type="Double" Nullable="false" />
+          <Property Name="UNITS" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="POINTS_PER_FRAME" Type="Int64" Nullable="false" />
+          <Property Name="MULTI_CHANNEL" Type="Boolean" Nullable="false" />
+          <Property Name="CHANNEL_COUNT" Type="Int64" Nullable="false" />
         </EntityType>
         <EntityType Name="JOB_RUNS">
           <Key>
@@ -1016,6 +1083,7 @@
           <Property Name="INTER_SEGMENT_LENGTH" Type="Double" Nullable="false" />
           <Property Name="ENABLE_INTER_SEGMENT" Type="Boolean" Nullable="false" />
           <Property Name="ENABLE_LUBRICATION" Type="Boolean" Nullable="false" />
+          <Property Name="JOB_INDEX" Type="Int64" Nullable="false" />
         </EntityType>
         <EntityType Name="LINEAR_MASS_DENSITY_UNITS">
           <Key>
@@ -1218,10 +1286,10 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="MANUFACTURER" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="CODE" Type="Int64" Nullable="false" />
-          <Property Name="MATERIAL_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="COLOR_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="PURPOSE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="CONDITION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MEDIA_MATERIAL_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MEDIA_COLOR_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MEDIA_PURPOSE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MEDIA_CONDITION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LINEAR_MASS_DENSITY_UNIT_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="FIBER_SHAPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="FIBER_SYNTH_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
@@ -1267,23 +1335,7 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="JOB_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="LENGTH" Type="Double" Nullable="false" />
-        </EntityType>
-        <EntityType Name="SENSOR">
-          <Key>
-            <PropertyRef Name="ID" />
-          </Key>
-          <Property Name="ID" Type="Int64" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
-          <Property Name="CODE" Type="Int64" Nullable="false" />
-          <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
-          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" />
-          <Property Name="MIN" Type="Double" Nullable="false" />
-          <Property Name="MAX" Type="Double" Nullable="false" />
-          <Property Name="UNITS" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
-          <Property Name="POINTS_PER_FRAME" Type="Int64" Nullable="false" />
-          <Property Name="MULTI_CHANNEL" Type="Boolean" Nullable="false" />
-          <Property Name="CHANNEL_COUNT" Type="Int64" Nullable="false" />
+          <Property Name="SEGMENT_INDEX" Type="Int64" Nullable="false" />
         </EntityType>
         <EntityType Name="SYNC_CONFIGURATIONS">
           <Key>
@@ -1412,6 +1464,14 @@
             <EntityTypeMapping TypeName="LocalModel.BRUSH_STOPS">
               <MappingFragment StoreEntitySet="BRUSH_STOPS">
                 <ScalarProperty Name="PANTON_GUID" ColumnName="PANTON_GUID" />
+                <ScalarProperty Name="V7" ColumnName="V7" />
+                <ScalarProperty Name="V6" ColumnName="V6" />
+                <ScalarProperty Name="V5" ColumnName="V5" />
+                <ScalarProperty Name="V4" ColumnName="V4" />
+                <ScalarProperty Name="V3" ColumnName="V3" />
+                <ScalarProperty Name="V2" ColumnName="V2" />
+                <ScalarProperty Name="V1" ColumnName="V1" />
+                <ScalarProperty Name="V0" ColumnName="V0" />
                 <ScalarProperty Name="B" ColumnName="B" />
                 <ScalarProperty Name="A" ColumnName="A" />
                 <ScalarProperty Name="L" ColumnName="L" />
@@ -1422,6 +1482,7 @@
                 <ScalarProperty Name="YELLOW" ColumnName="YELLOW" />
                 <ScalarProperty Name="MAGENTA" ColumnName="MAGENTA" />
                 <ScalarProperty Name="CYAN" ColumnName="CYAN" />
+                <ScalarProperty Name="STOP_INDEX" ColumnName="STOP_INDEX" />
                 <ScalarProperty Name="OFFSET_PERCENT" ColumnName="OFFSET_PERCENT" />
                 <ScalarProperty Name="COLOR_SPACE_GUID" ColumnName="COLOR_SPACE_GUID" />
                 <ScalarProperty Name="SEGMENT_GUID" ColumnName="SEGMENT_GUID" />
@@ -1609,9 +1670,23 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="IDS_PACK_FORMULAS">
+            <EntityTypeMapping TypeName="LocalModel.IDS_PACK_FORMULAS">
+              <MappingFragment StoreEntitySet="IDS_PACK_FORMULAS">
+                <ScalarProperty Name="AUTO_CALCULATED" ColumnName="AUTO_CALCULATED" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="IDS_PACKS">
             <EntityTypeMapping TypeName="LocalModel.IDS_PACKS">
               <MappingFragment StoreEntitySet="IDS_PACKS">
+                <ScalarProperty Name="IDS_PACK_FORMULA_GUID" ColumnName="IDS_PACK_FORMULA_GUID" />
                 <ScalarProperty Name="PACK_INDEX" ColumnName="PACK_INDEX" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
                 <ScalarProperty Name="MID_TANK_TYPE_GUID" ColumnName="MID_TANK_TYPE_GUID" />
@@ -1625,6 +1700,25 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="IOS">
+            <EntityTypeMapping TypeName="LocalModel.IO">
+              <MappingFragment StoreEntitySet="IOS">
+                <ScalarProperty Name="CHANNEL_COUNT" ColumnName="CHANNEL_COUNT" />
+                <ScalarProperty Name="MULTI_CHANNEL" ColumnName="MULTI_CHANNEL" />
+                <ScalarProperty Name="POINTS_PER_FRAME" ColumnName="POINTS_PER_FRAME" />
+                <ScalarProperty Name="UNITS" ColumnName="UNITS" />
+                <ScalarProperty Name="MAX" ColumnName="MAX" />
+                <ScalarProperty Name="MIN" ColumnName="MIN" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="TYPE" ColumnName="TYPE" />
+                <ScalarProperty Name="CODE" ColumnName="CODE" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="JOB_RUNS">
             <EntityTypeMapping TypeName="LocalModel.JOB_RUNS">
               <MappingFragment StoreEntitySet="JOB_RUNS">
@@ -1641,6 +1735,7 @@
           <EntitySetMapping Name="JOBS">
             <EntityTypeMapping TypeName="LocalModel.JOB">
               <MappingFragment StoreEntitySet="JOBS">
+                <ScalarProperty Name="JOB_INDEX" ColumnName="JOB_INDEX" />
                 <ScalarProperty Name="ENABLE_LUBRICATION" ColumnName="ENABLE_LUBRICATION" />
                 <ScalarProperty Name="ENABLE_INTER_SEGMENT" ColumnName="ENABLE_INTER_SEGMENT" />
                 <ScalarProperty Name="INTER_SEGMENT_LENGTH" ColumnName="INTER_SEGMENT_LENGTH" />
@@ -1879,10 +1974,10 @@
                 <ScalarProperty Name="FIBER_SYNTH_GUID" ColumnName="FIBER_SYNTH_GUID" />
                 <ScalarProperty Name="FIBER_SHAPE_GUID" ColumnName="FIBER_SHAPE_GUID" />
                 <ScalarProperty Name="LINEAR_MASS_DENSITY_UNIT_GUID" ColumnName="LINEAR_MASS_DENSITY_UNIT_GUID" />
-                <ScalarProperty Name="CONDITION_GUID" ColumnName="CONDITION_GUID" />
-                <ScalarProperty Name="PURPOSE_GUID" ColumnName="PURPOSE_GUID" />
-                <ScalarProperty Name="COLOR_GUID" ColumnName="COLOR_GUID" />
-                <ScalarProperty Name="MATERIAL_GUID" ColumnName="MATERIAL_GUID" />
+                <ScalarProperty Name="MEDIA_CONDITION_GUID" ColumnName="MEDIA_CONDITION_GUID" />
+                <ScalarProperty Name="MEDIA_PURPOSE_GUID" ColumnName="MEDIA_PURPOSE_GUID" />
+                <ScalarProperty Name="MEDIA_COLOR_GUID" ColumnName="MEDIA_COLOR_GUID" />
+                <ScalarProperty Name="MEDIA_MATERIAL_GUID" ColumnName="MEDIA_MATERIAL_GUID" />
                 <ScalarProperty Name="CODE" ColumnName="CODE" />
                 <ScalarProperty Name="MANUFACTURER" ColumnName="MANUFACTURER" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
@@ -1918,6 +2013,7 @@
           <EntitySetMapping Name="SEGMENTS">
             <EntityTypeMapping TypeName="LocalModel.SEGMENT">
               <MappingFragment StoreEntitySet="SEGMENTS">
+                <ScalarProperty Name="SEGMENT_INDEX" ColumnName="SEGMENT_INDEX" />
                 <ScalarProperty Name="LENGTH" ColumnName="LENGTH" />
                 <ScalarProperty Name="JOB_GUID" ColumnName="JOB_GUID" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
@@ -1927,24 +2023,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="SENSORS">
-            <EntityTypeMapping TypeName="LocalModel.SENSOR">
-              <MappingFragment StoreEntitySet="SENSORS">
-                <ScalarProperty Name="CHANNEL_COUNT" ColumnName="CHANNEL_COUNT" />
-                <ScalarProperty Name="MULTI_CHANNEL" ColumnName="MULTI_CHANNEL" />
-                <ScalarProperty Name="POINTS_PER_FRAME" ColumnName="POINTS_PER_FRAME" />
-                <ScalarProperty Name="UNITS" ColumnName="UNITS" />
-                <ScalarProperty Name="MAX" ColumnName="MAX" />
-                <ScalarProperty Name="MIN" ColumnName="MIN" />
-                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
-                <ScalarProperty Name="NAME" ColumnName="NAME" />
-                <ScalarProperty Name="CODE" ColumnName="CODE" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="SYNC_CONFIGURATIONS">
             <EntityTypeMapping TypeName="LocalModel.SYNC_CONFIGURATIONS">
               <MappingFragment StoreEntitySet="SYNC_CONFIGURATIONS">
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index bce29c8bf..a06fd10c6 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -12,47 +12,48 @@
         <EntityTypeShape EntityType="LocalModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="2.75" PointY="4.75" />
         <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSIONS" Width="1.5" PointX="4.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.BRUSH_STOPS" Width="1.5" PointX="6.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.CARTRIDGE_TYPES" Width="1.5" PointX="4.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CAT" Width="1.5" PointX="6.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.COLOR_SPACES" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="8.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="8.75" PointY="8.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="2.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.CAT" Width="1.5" PointX="2.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="4.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.COLOR_SPACES" Width="1.5" PointX="6.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="8.75" PointY="5.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="9.75" />
         <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="4.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="10.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="12.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.JOB_RUNS" Width="1.5" PointX="6.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.JOB" Width="1.5" PointX="8.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="0.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="2.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="10.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="14.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="14.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MID_TANK_TYPES" Width="1.5" PointX="2.75" PointY="16.75" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="16.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="4.75" PointY="16.75" />
-        <EntityTypeShape EntityType="LocalModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="16.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="16.75" PointY="12.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="16.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="16.75" PointY="16.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="6.75" PointY="17.75" />
-        <EntityTypeShape EntityType="LocalModel.SEGMENT" Width="1.5" PointX="8.75" PointY="17.75" />
-        <EntityTypeShape EntityType="LocalModel.SENSOR" Width="1.5" PointX="10.75" PointY="17.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="18.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="18.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="18.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="10.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="2.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.IDS_PACK_FORMULAS" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="12.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.IO" Width="1.5" PointX="12.75" PointY="8.75" />
+        <EntityTypeShape EntityType="LocalModel.JOB_RUNS" Width="1.5" PointX="6.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.JOB" Width="1.5" PointX="8.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="10.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="12.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="14.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="2.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="14.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="14.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="14.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="16.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.MID_TANK_TYPES" Width="1.5" PointX="16.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="16.75" PointY="9.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="16.75" PointY="12.75" />
+        <EntityTypeShape EntityType="LocalModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="14.75" PointY="16.75" />
+        <EntityTypeShape EntityType="LocalModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="16.75" PointY="15.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="4.75" PointY="17.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="10.75" PointY="17.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="18.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.SEGMENT" Width="1.5" PointX="0.75" PointY="18.75" />
+        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="18.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="18.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="6.75" PointY="18.75" />
         <EntityTypeShape EntityType="LocalModel.WINDING_METHODS" Width="1.5" PointX="18.75" PointY="10.75" />
       </Diagram>
     </edmx:Diagrams>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
index f529c3a14..80326e4d1 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/RML.cs
@@ -20,10 +20,10 @@ namespace Tango.DAL.Local.DB
         public string NAME { get; set; }
         public string MANUFACTURER { get; set; }
         public long CODE { get; set; }
-        public string MATERIAL_GUID { get; set; }
-        public string COLOR_GUID { get; set; }
-        public string PURPOSE_GUID { get; set; }
-        public string CONDITION_GUID { get; set; }
+        public string MEDIA_MATERIAL_GUID { get; set; }
+        public string MEDIA_COLOR_GUID { get; set; }
+        public string MEDIA_PURPOSE_GUID { get; set; }
+        public string MEDIA_CONDITION_GUID { get; set; }
         public string LINEAR_MASS_DENSITY_UNIT_GUID { get; set; }
         public string FIBER_SHAPE_GUID { get; set; }
         public string FIBER_SYNTH_GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/SEGMENT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/SEGMENT.cs
index 2fec238ca..38123faeb 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/SEGMENT.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/SEGMENT.cs
@@ -20,5 +20,6 @@ namespace Tango.DAL.Local.DB
         public string NAME { get; set; }
         public string JOB_GUID { get; set; }
         public double LENGTH { get; set; }
+        public long SEGMENT_INDEX { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index 1d3577302..1dec945f6 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -131,6 +131,12 @@
     <Compile Include="DB\IDS_PACKS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\IDS_PACK_FORMULAS.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\IO.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\JOB.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
@@ -212,9 +218,6 @@
     <Compile Include="DB\SEGMENT.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\SENSOR.cs">
-      <DependentUpon>LocalADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\SYNC_CONFIGURATIONS.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>