diff --git a/src/Gemstone.Numeric/EE/SignalKind.cs b/src/Gemstone.Numeric/EE/SignalKind.cs
index d9d1eaa45..4806456ab 100644
--- a/src/Gemstone.Numeric/EE/SignalKind.cs
+++ b/src/Gemstone.Numeric/EE/SignalKind.cs
@@ -87,6 +87,14 @@ public enum SignalKind
     /// </summary>
     Quality,
     /// <summary>
+    /// Point-on-wave current.
+    /// </summary>
+    PoWCurrent,
+    /// <summary>
+    /// Point-on-wave voltage.
+    /// </summary>
+    PoWVoltage,
+    /// <summary>
     /// Undetermined signal type.
     /// </summary>
     Unknown
@@ -128,6 +136,10 @@ public static string GetAcronym(this SignalKind signal)
                 return "AL"; // Alarm Value
             case SignalKind.Quality:
                 return "QF"; // Quality Flags
+            case SignalKind.PoWCurrent:
+                return "IW"; // Point-on-Wave Current
+            case SignalKind.PoWVoltage:
+                return "VW"; // Point-on-Wave Voltage
             default:
                 return "??";
         }
@@ -140,32 +152,35 @@ public static string GetAcronym(this SignalKind signal)
     /// <returns>The <see cref="SignalKind"/> for the specified <paramref name="acronym"/>.</returns>
     public static SignalKind ParseSignalKind(this string acronym)
     {
-        switch (acronym)
+        return acronym switch
         {
-            case "PA": // Phase Angle
-                return SignalKind.Angle;
-            case "PM": // Phase Magnitude
-                return SignalKind.Magnitude;
-            case "FQ": // Frequency
-                return SignalKind.Frequency;
-            case "DF": // dF/dt
-                return SignalKind.DfDt;
-            case "SF": // Status Flags
-                return SignalKind.Status;
-            case "DV": // Digital Value
-                return SignalKind.Digital;
-            case "AV": // Analog Value
-                return SignalKind.Analog;
-            case "CV": // Calculated Value
-                return SignalKind.Calculation;
-            case "ST": // Statistical Value
-                return SignalKind.Statistic;
-            case "AL": // Alarm Value
-                return SignalKind.Alarm;
-            case "QF": // Quality Flags
-                return SignalKind.Quality;
-            default:
-                return SignalKind.Unknown;
-        }
+            "PA" => // Phase Angle
+                SignalKind.Angle,
+            "PM" => // Phase Magnitude
+                SignalKind.Magnitude,
+            "FQ" => // Frequency
+                SignalKind.Frequency,
+            "DF" => // dF/dt
+                SignalKind.DfDt,
+            "SF" => // Status Flags
+                SignalKind.Status,
+            "DV" => // Digital Value
+                SignalKind.Digital,
+            "AV" => // Analog Value
+                SignalKind.Analog,
+            "CV" => // Calculated Value
+                SignalKind.Calculation,
+            "ST" => // Statistical Value
+                SignalKind.Statistic,
+            "AL" => // Alarm Value
+                SignalKind.Alarm,
+            "QF" => // Quality Flags
+                SignalKind.Quality,
+            "IW" => // Point-on-wave Current
+                SignalKind.PoWCurrent,
+            "VW" => // Point-on-wave Voltage
+                SignalKind.PoWVoltage,
+            _ => SignalKind.Unknown
+        };
     }
 }
diff --git a/src/Gemstone.Numeric/EE/SignalType.cs b/src/Gemstone.Numeric/EE/SignalType.cs
index 32b4c0fc5..bdb5f86a2 100644
--- a/src/Gemstone.Numeric/EE/SignalType.cs
+++ b/src/Gemstone.Numeric/EE/SignalType.cs
@@ -95,6 +95,14 @@ public enum SignalType
     /// </summary>
     QUAL = 13,
     /// <summary>
+    /// Point-on-Wave current.
+    /// </summary>
+    IPOW = 14,
+    /// <summary>
+    /// Point-on-Wave voltage.
+    /// </summary>
+    VPOW = 15,
+    /// <summary>
     /// Undefined signal.
     /// </summary>
     NONE = -1
@@ -131,15 +139,19 @@ public static string GetFormattedName(this SignalType signalType)
             case SignalType.FLAG:
                 return "Status flags";
             case SignalType.DIGI:
-                return "Digital Values";
+                return "Digital values";
             case SignalType.CALC:
-                return "Calculated Value";
+                return "Calculated value";
             case SignalType.STAT:
                 return "Statistic";
             case SignalType.ALRM:
                 return "Alarm";
             case SignalType.QUAL:
-                return "Quality Flags";
+                return "Quality flags";
+            case SignalType.IPOW:
+                return "Point-on-Wave current";
+            case SignalType.VPOW:
+                return "Point-on-Wave voltage";
             case SignalType.NONE:
                 return "Undefined";
             default: