diff --git a/Source/Applications/SystemCenter/Controllers/OpenXDA/Assets/OpenXDAAssetController.cs b/Source/Applications/SystemCenter/Controllers/OpenXDA/Assets/OpenXDAAssetController.cs
index fabcc4c32..019ae00e5 100644
--- a/Source/Applications/SystemCenter/Controllers/OpenXDA/Assets/OpenXDAAssetController.cs
+++ b/Source/Applications/SystemCenter/Controllers/OpenXDA/Assets/OpenXDAAssetController.cs
@@ -383,11 +383,11 @@ public int PostNewAsset(JObject record)
                         Description = asset["Description"].ToString(),
                         AssetName = asset["AssetName"].ToString(),
                         AssetTypeID = assetTypeID,
-                        R0 = asset["Segment"]["R0"].ToObject<double>(),
-                        X0 = asset["Segment"]["X0"].ToObject<double>(),
-                        R1 = asset["Segment"]["R1"].ToObject<double>(),
-                        X1 = asset["Segment"]["X1"].ToObject<double>(),
-                        Length = asset["Segment"]["Length"].ToObject<double>(),
+                        R0 = asset["Detail"]?.Value<double?>("R0") ?? 0,
+                        X0 = asset["Detail"]?.Value<double?>("X0") ?? 0,
+                        R1 = asset["Detail"]?.Value<double?>("R1") ?? 0,
+                        X1 = asset["Detail"]?.Value<double?>("X1") ?? 0,
+                        Length = asset["Detail"]?.Value<double?>("Length") ?? 0
                     };
                     lineSegment.AssetTypeID = connection.ExecuteScalar<int>("SELECT ID FROM AssetType WHERE Name = 'LineSegment'");
 
@@ -478,6 +478,12 @@ public int PostNewAsset(JObject record)
                     CreateTransformerFromJToken(transformer, asset);
                     new TableOperations<Transformer>(connection).AddNewRecord(transformer);
                 }
+                else if (assetType == "DER")
+                {
+                    DER der = new DER();
+                    CreateDERFromJToken(der, asset);
+                    new TableOperations<DER>(connection).AddNewRecord(der);
+                }
                 else
                 {
                     Asset newAsset = new Asset();
@@ -913,28 +919,29 @@ private void CreateCapBankFromJToken(CapBank capBank, JToken record)
             capBank.PosReactanceTol = record["PosReactanceTol"].ToObject<double>();
             capBank.Nparalell = record["Nparalell"].ToObject<int>();
             capBank.Nseries = record["Nseries"].ToObject<int>();
-            capBank.NSeriesGroup = record["NSeriesGroup"].ToObject<int>();
-            capBank.NParalellGroup = record["NParalellGroup"].ToObject<int>();
-            capBank.Fused = record["Fused"].ToObject<bool>();
-            capBank.VTratioBus = record["VTratioBus"].ToObject<double>();
-            capBank.NumberLVCaps = record["NumberLVCaps"].ToObject<int>();
-            capBank.NumberLVUnits = record["NumberLVUnits"].ToObject<int>();
-            capBank.LVKVAr = record["LVKVAr"].ToObject<double>(); 
-            capBank.LVKV = record["LVKV"].ToObject<double>();
-            capBank.LVNegReactanceTol = record["LVNegReactanceTol"].ToObject<double>();
-            capBank.LVPosReactanceTol = record["LVPosReactanceTol"].ToObject<double>();
+            capBank.NSeriesGroup = record.Value<int?>("NSeriesGroup") ?? 0;
+            capBank.NParalellGroup = record.Value<int?>("NParalellGroup") ?? 0;
+            capBank.Fused = record.Value<bool?>("Fused") ?? true;
+            capBank.VTratioBus = record.Value<double?>("VTratioBus") ?? 0;
+            capBank.NumberLVCaps = record.Value<int?>("NumberLVCaps") ?? 0;
+            capBank.NumberLVUnits = record.Value<int?>("NumberLVUnits") ?? 0;
+            capBank.LVKVAr = record.Value<double?>("LVKVAr") ?? 0;
+            capBank.LVKV = record.Value<double?>("LVKV") ?? 0;
+            capBank.LVNegReactanceTol = record.Value<double?>("LVNegReactanceTol") ?? 0;
+            capBank.LVPosReactanceTol = record.Value<double?>("LVPosReactanceTol") ?? 0;
+
             capBank.LowerXFRRatio = record["LowerXFRRatio"].ToObject<double>();
             capBank.Nshorted = record["Nshorted"].ToObject<double>();
             capBank.BlownFuses = record["BlownFuses"].ToObject<int>();
             capBank.BlownGroups = record["BlownGroups"].ToObject<int>();
-            capBank.ShortedGroups = record["ShortedGroups"].ToObject<double>();
-            capBank.NLowerGroups = record["NLowerGroups"].ToObject<int>();
-
-            capBank.RelayPTRatioPrimary = record["RelayPTRatioPrimary"].ToObject<int>();
-            capBank.RelayPTRatioSecondary = record["RelayPTRatioSecondary"].ToObject<int>();
-            capBank.Sh = record["Sh"].ToObject<double>();
-            capBank.Rv = record["Rv"].ToObject<double>();
-            capBank.Rh = record["Rh"].ToObject<double>();
+            capBank.ShortedGroups = record.Value<double?>("ShortedGroups") ?? 0;
+            capBank.NLowerGroups = record.Value<int?>("NLowerGroups") ?? 0;
+
+            capBank.RelayPTRatioPrimary = record.Value<int?>("RelayPTRatioPrimary") ?? 0;
+            capBank.RelayPTRatioSecondary = record.Value<int?>("RelayPTRatioSecondary") ?? 0;
+            capBank.Sh = record.Value<double?>("Sh") ?? 0;
+            capBank.Rv = record.Value<double?>("Rv") ?? 0;
+            capBank.Rh = record.Value<double?>("Rh") ?? 0;
             capBank.Compensated = record["Compensated"].ToObject<bool>();
 
         }
@@ -961,13 +968,22 @@ private void CreateTransformerFromJToken(Transformer transformer, JToken record)
             transformer.ThermalRating = record["ThermalRating"].ToObject<double>();
             transformer.PrimaryVoltageKV = record["PrimaryVoltageKV"].ToObject<double>();
             transformer.SecondaryVoltageKV = record["SecondaryVoltageKV"].ToObject<double>();
-            transformer.TertiaryVoltageKV = record["TertiaryVoltageKV"].ToObject<double>();
+            transformer.TertiaryVoltageKV = record.Value<double?>("TertiaryVoltageKV") ?? 0;
             transformer.PrimaryWinding = record["PrimaryWinding"].ToObject<double>();
             transformer.SecondaryWinding = record["SecondaryWinding"].ToObject<double>();
-            transformer.TertiaryWinding = record["TertiaryWinding"].ToObject<double>();
+            transformer.TertiaryWinding = record.Value<double?>("TertiaryWinding") ?? 0;
             transformer.Tap = record["Tap"].ToObject<double>();
             transformer.Spare = record["Spare"].ToObject<bool>();
         }
+        private void CreateDERFromJToken(DER der, JToken record)
+        {
+            der.VoltageKV = record["VoltageKV"].ToObject<double>();
+            der.AssetKey = record["AssetKey"].ToString();
+            der.Description = record["Description"].ToString();
+            der.AssetName = record["AssetName"].ToString();
+            der.FullRatedOutputCurrent = record["FullRatedOutputCurrent"].ToObject<double>();
+            der.VoltageLevel = record["VoltageLevel"].ToString();
+        }
 
         ////Need to Override the external DB Function to return the list for all Assets
         //public override IHttpActionResult GetExtendedDataBases()
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AssetAttribute/Asset.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AssetAttribute/Asset.tsx
index b754d1a5b..d3b392bf2 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AssetAttribute/Asset.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/AssetAttribute/Asset.tsx
@@ -200,6 +200,7 @@ export namespace AssetAttributes {
             record.TripTime = null;
             record.PickupTime = null;
             record.TripCoilCondition = null;
+            record.AirGapResistor = false;
             return record;
         }
         else if (type == 'Bus') {
@@ -256,6 +257,8 @@ export namespace AssetAttributes {
             record.ThermalRating = null;
             record.PrimaryVoltageKV = null;
             record.SecondaryVoltageKV = null;
+            record.TertiaryVoltageKV = null;
+            record.TertiaryWinding = null;
             record.Tap = null;
             return record
         }
@@ -320,7 +323,6 @@ export namespace AssetAttributes {
                 errors.push('A valid Pickup Time Limit is required.')
             if ((asset as OpenXDA.Types.Breaker).TripCoilCondition == null || !AssetAttributes.isRealNumber((asset as OpenXDA.Types.Breaker).TripCoilCondition))
                 errors.push('A valid Trip Coil Condition Limit is required.')
-           
         }
 
         if (type == 'CapacitorBankRelay') {
diff --git a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/MeterAsset.tsx b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/MeterAsset.tsx
index 5194b0d96..60c0cd0f7 100644
--- a/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/MeterAsset.tsx
+++ b/Source/Applications/SystemCenter/wwwroot/Scripts/TSX/SystemCenter/Meter/MeterAsset.tsx
@@ -27,6 +27,7 @@ import { Application, OpenXDA } from '@gpa-gemstone/application-typings';
 import BusAttributes from '../AssetAttribute/Bus';
 import BreakerAttributes from '../AssetAttribute/Breaker';
 import CapBankAttributes from '../AssetAttribute/CapBank';
+import CapBankRelayAttributes from '../AssetAttribute/CapBankRelay';
 import LineAttributes from '../AssetAttribute/Line';
 import TransformerAttributes from '../AssetAttribute/Transformer';
 import { useNavigate } from 'react-router-dom';
@@ -335,6 +336,8 @@ const MeterAssetWindow = (props: IProps) => {
             return <BreakerAttributes NewEdit={newEdit} Asset={activeAsset as OpenXDA.Types.Breaker} UpdateState={changeActiveAsset} ShowSpare={true} />;
         else if (activeAsset.AssetType == 'Bus')
             return <BusAttributes NewEdit={newEdit} Asset={activeAsset} UpdateState={changeActiveAsset} />;
+        else if (activeAsset.AssetType == 'CapacitorBankRelay')
+            return <CapBankRelayAttributes NewEdit={newEdit} Asset={activeAsset as OpenXDA.Types.CapBankRelay} UpdateState={changeActiveAsset} />
         else if (activeAsset.AssetType == 'CapacitorBank')
             return <CapBankAttributes NewEdit={newEdit} Asset={activeAsset as OpenXDA.Types.CapBank} UpdateState={changeActiveAsset} />;
         else if (activeAsset.AssetType == 'Line')