diff --git a/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js b/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js
index 4739e6409..d83258903 100644
--- a/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js
+++ b/gpii/node_modules/spiSettingsHandler/src/SpiSettingsHandler.js
@@ -277,7 +277,7 @@ gpii.windows.spi.populateResults = function (payload, isNewValue, isGetting, res
             results[currentSetting] = {};
         }
 
-        var path = payload.settings[currentSetting].path;
+        var path = payload.supportedSettings[currentSetting].path;
         if (path.get !== undefined) {
             path = path.get;
         }
@@ -285,8 +285,7 @@ gpii.windows.spi.populateResults = function (payload, isNewValue, isGetting, res
 
         if (isGetting) {
             results[currentSetting] = {
-                value: valueToSet,
-                path: payload.settings[currentSetting].path
+                value: valueToSet
             };
         } else {
             results[currentSetting][isNewValue ? "newValue" : "oldValue"] = valueToSet;
@@ -371,7 +370,7 @@ gpii.windows.spi.getPvParam = function (payload) {
     var pvParam = systemSettings.pvParam;
 
     for (var currentSetting in payload.settings) {
-        var path = payload.settings[currentSetting].path;
+        var path = payload.supportedSettings[currentSetting].path;
         if (path.set !== undefined) {
             path = path.set;
         }
@@ -419,8 +418,8 @@ gpii.windows.spi.setImpl = function (payload) {
 
             // transform results here   oldValue: x   -->   oldValue: { value: x, path: ... }
             fluid.each(results, function (value, setting) {
-                results[setting].oldValue = {"value": value.oldValue, "path": payload.settings[setting].path};
-                results[setting].newValue = {"value": value.newValue, "path": payload.settings[setting].path};
+                results[setting].oldValue = {"value": value.oldValue};
+                results[setting].newValue = {"value": value.newValue};
             });
 
             fluid.log("SPI settings handler SET returning results ", results);
diff --git a/gpii/node_modules/spiSettingsHandler/test/testAPI.json b/gpii/node_modules/spiSettingsHandler/test/testAPI.json
index cc7e01446..e518772cd 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testAPI.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testAPI.json
@@ -9,15 +9,18 @@
                     "type": "UINT"
                 }
             },
-
-            "settings": {
+            "supportedSettings": {
                 "MouseTrails": {
-                    "value": 10,
                     "path": {
                         "set": "uiParam",
                         "get": "pvParam"
                     }
                 }
+            },
+            "settings": {
+                "MouseTrails": {
+                    "value": 10
+                }
             }
         },
         {
@@ -31,12 +34,15 @@
                     "length": 3
                 }
             },
-
-            "settings": {
+            "supportedSettings": {
                 "MouseAcceleration": {
-                    "value": 2,
                     "path": "pvParam.2"
                 }
+            },
+            "settings": {
+                "MouseAcceleration": {
+                    "value": 2
+                }
             }
         }
     ],
@@ -52,15 +58,18 @@
                             "type": "UINT"
                         }
                     },
-
-                    "settings": {
+                    "supportedSettings": {
                         "MouseTrails": {
-                            "value": 5,
                             "path": {
                                 "set": "uiParam",
                                 "get": "pvParam"
                             }
                         }
+                    },
+                    "settings": {
+                        "MouseTrails": {
+                            "value": 5
+                        }
                     }
                 },
                 {
@@ -74,11 +83,15 @@
                             "length": 3
                         }
                     },
-                    "settings": {
+                    "supportedSettings": {
                         "MouseAcceleration": {
-                            "value": 0,
                             "path": "pvParam.2"
                         }
+                    },
+                    "settings": {
+                        "MouseAcceleration": {
+                            "value": 0
+                        }
                     }
                 }
             ]
@@ -89,18 +102,10 @@
                     "settings": {
                         "MouseTrails": {
                             "oldValue": {
-                                "value": 10,
-                                "path": {
-                                    "set": "uiParam",
-                                    "get": "pvParam"
-                                }
+                                "value": 10
                             },
                             "newValue": {
-                                "value": 5,
-                                "path": {
-                                    "set": "uiParam",
-                                    "get": "pvParam"
-                                }
+                                "value": 5
                             }
                         }
                     }
@@ -108,12 +113,10 @@
                     "settings": {
                         "MouseAcceleration": {
                             "oldValue": {
-                                "value": 1,
-                                "path": "pvParam.2"
+                                "value": 1
                             },
                             "newValue": {
-                                "value": 0,
-                                "path": "pvParam.2"
+                                "value": 0
                             }
                         }
                     }
@@ -133,14 +136,18 @@
                         },
                         "uiParam": 0
                     },
-                    "settings": {
+                    "supportedSettings": {
                         "MouseTrails": {
-                            "value": 0,
                             "path": {
                                 "set": "uiParam",
                                 "get": "pvParam"
                             }
                         }
+                    },
+                    "settings": {
+                        "MouseTrails": {
+                            "value": 0
+                        }
                     }
                 },
                 {
@@ -154,11 +161,15 @@
                             "length": 3
                         }
                     },
-                    "settings": {
+                    "supportedSettings": {
                         "MouseAcceleration": {
-                            "value": 1,
                             "path": "pvParam.2"
                         }
+                    },
+                    "settings": {
+                        "MouseAcceleration": {
+                            "value": 1
+                        }
                     }
                 }
             ]
@@ -168,18 +179,13 @@
                 {
                     "settings": {
                         "MouseTrails": {
-                            "value": 10,
-                            "path": {
-                                "set": "uiParam",
-                                "get": "pvParam"
-                            }
+                            "value": 10
                         }
                     }
                 }, {
                     "settings": {
                         "MouseAcceleration": {
-                            "value": 1,
-                            "path": "pvParam.2"
+                            "value": 1
                         }
                     }
                 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testAudioDescription.json b/gpii/node_modules/spiSettingsHandler/test/testAudioDescription.json
index 3f1b39bf4..e6d3a6090 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testAudioDescription.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testAudioDescription.json
@@ -13,11 +13,14 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "AudioDescriptionOn": {
-            "value": 1,
             "path": "pvParam.Enabled"
         }
+    },
+    "settings": {
+        "AudioDescriptionOn": {
+            "value": 1
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testFilterKeys.json b/gpii/node_modules/spiSettingsHandler/test/testFilterKeys.json
index 2699fb4de..7660009e8 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testFilterKeys.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testFilterKeys.json
@@ -16,26 +16,38 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "FilterKeysAvailable": {
-            "value": true,
             "path": "pvParam.dwFlags.FKF_AVAILABLE"
         },
 
         "ConfirmHotkey": {
-            "value": true,
             "path": "pvParam.dwFlags.FKF_CONFIRMHOTKEY"
         },
 
         "Wait": {
-            "value": 1000,
             "path": "pvParam.iWaitMSec"
         },
 
         "Delay": {
-            "value": 1000,
             "path": "pvParam.iDelayMSec"
         }
+    },
+    "settings": {
+        "FilterKeysAvailable": {
+            "value": true
+        },
+
+        "ConfirmHotkey": {
+            "value": true
+        },
+
+        "Wait": {
+            "value": 1000
+        },
+
+        "Delay": {
+            "value": 1000
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testHighContrast.json b/gpii/node_modules/spiSettingsHandler/test/testHighContrast.json
index ab8f185a7..ea375c758 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testHighContrast.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testHighContrast.json
@@ -13,21 +13,30 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "HighContrastOn": {
-            "value": false,
             "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON"
         },
 
         "HotkeyActive": {
-            "value": true,
             "path": "pvParam.dwFlags.HCF_HOTKEYACTIVE"
         },
 
         "HighContrastTheme": {
-            "value": "High Contrast Black",
             "path": "pvParam.lpszDefaultScheme"
         }
+    },
+    "settings": {
+        "HighContrastOn": {
+            "value": false
+        },
+
+        "HotkeyActive": {
+            "value": true
+        },
+
+        "HighContrastTheme": {
+            "value": "High Contrast Black"
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testHighContrastToEmpty.json b/gpii/node_modules/spiSettingsHandler/test/testHighContrastToEmpty.json
index 4567a120a..b6135155c 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testHighContrastToEmpty.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testHighContrastToEmpty.json
@@ -13,21 +13,30 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "HighContrastOn": {
-            "value": false,
             "path": "pvParam.dwFlags.HCF_HIGHCONTRASTON"
         },
 
         "HotkeyActive": {
-            "value": true,
             "path": "pvParam.dwFlags.HCF_HOTKEYACTIVE"
         },
 
         "HighContrastTheme": {
-            "value": "",
             "path": "pvParam.lpszDefaultScheme"
         }
+    },
+    "settings": {
+        "HighContrastOn": {
+            "value": false
+        },
+
+        "HotkeyActive": {
+            "value": true
+        },
+
+        "HighContrastTheme": {
+            "value": ""
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testLogFont.json b/gpii/node_modules/spiSettingsHandler/test/testLogFont.json
index 99f128c02..3d599488d 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testLogFont.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testLogFont.json
@@ -8,21 +8,30 @@
             "name": "LOGFONT"
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "Italic": {
-            "value": 1,
             "path": "pvParam.lfItalic"
         },
 
         "Underline": {
-            "value": 1,
             "path": "pvParam.lfUnderline"
         },
 
         "Quality": {
-            "value": 5,
             "path": "pvParam.lfQuality"
         }
+    },
+    "settings": {
+        "Italic": {
+            "value": 1
+        },
+
+        "Underline": {
+            "value": 1
+        },
+
+        "Quality": {
+            "value": 5
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testMouse.json b/gpii/node_modules/spiSettingsHandler/test/testMouse.json
index f411b493b..3e113a7f0 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testMouse.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testMouse.json
@@ -9,11 +9,14 @@
             "length": 3
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "MouseAcceleration": {
-            "value": 0,
             "path": "pvParam.2"
         }
+    },
+    "settings": {
+        "MouseAcceleration": {
+            "value": 0
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testMouseClickLock.json b/gpii/node_modules/spiSettingsHandler/test/testMouseClickLock.json
index 106333fc5..577b324f3 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testMouseClickLock.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testMouseClickLock.json
@@ -7,11 +7,14 @@
             "type": "BOOL"
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "MouseClickLock": {
-            "value": 1,
             "path": "pvParam"
         }
+    },
+    "settings": {
+        "MouseClickLock": {
+            "value": 1
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testMouseKeys.json b/gpii/node_modules/spiSettingsHandler/test/testMouseKeys.json
index ca14874f5..66e1272cc 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testMouseKeys.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testMouseKeys.json
@@ -17,31 +17,46 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "FilterKeysAvailable": {
-            "value": true,
             "path": "pvParam.dwFlags.MKF_AVAILABLE"
         },
 
         "MouseKeysOn": {
-            "value": false,
             "path": "pvParam.dwFlags.MKF_MOUSEKEYSON"
         },
 
         "MaxSpeed": {
-            "value": 100,
             "path": "pvParam.iMaxSpeed"
         },
 
         "Acceleration": {
-            "value": 1000,
             "path": "pvParam.iTimeToMaxSpeed"
         },
 
         "CtrlSpeed": {
-            "value": 2,
             "path": "pvParam.iCtrlSpeed"
         }
+    },
+    "settings": {
+        "FilterKeysAvailable": {
+            "value": true
+        },
+
+        "MouseKeysOn": {
+            "value": false
+        },
+
+        "MaxSpeed": {
+            "value": 100
+        },
+
+        "Acceleration": {
+            "value": 1000
+        },
+
+        "CtrlSpeed": {
+            "value": 2
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testMouseTrails.json b/gpii/node_modules/spiSettingsHandler/test/testMouseTrails.json
index 9d3f19c75..d687e4b2b 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testMouseTrails.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testMouseTrails.json
@@ -7,14 +7,17 @@
             "type": "UINT"
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "MouseTrails": {
-            "value": 10,
             "path": {
                 "set": "uiParam",
                 "get": "pvParam"
             }
         }
+    },
+    "settings": {
+        "MouseTrails": {
+            "value": 10
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testNonClientMetrics.json b/gpii/node_modules/spiSettingsHandler/test/testNonClientMetrics.json
index de7c1916d..a5af99e0d 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testNonClientMetrics.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testNonClientMetrics.json
@@ -8,36 +8,54 @@
             "name": "NONCLIENTMETRICS"
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "ScrollWidth": {
-            "value": 30,
             "path": "pvParam.iScrollWidth"
         },
 
         "ScrollHeight": {
-            "value": 30,
             "path": "pvParam.iScrollHeight"
         },
 
         "CaptionFontItalic": {
-            "value": 1,
             "path": "pvParam.lfCaptionFont.lfItalic"
         },
 
         "SmallCaptionFontUnderline": {
-            "value": 1,
             "path": "pvParam.lfSmCaptionFont.lfUnderline"
         },
 
         "MenuFontItalic": {
-            "value": 1,
             "path": "pvParam.lfMenuFont.lfItalic"
         },
 
         "MenuFontUnderline": {
-            "value": 1,
             "path": "pvParam.lfMenuFont.lfUnderline"
         }
+    },
+    "settings": {
+        "ScrollWidth": {
+            "value": 30
+        },
+
+        "ScrollHeight": {
+            "value": 30
+        },
+
+        "CaptionFontItalic": {
+            "value": 1
+        },
+
+        "SmallCaptionFontUnderline": {
+            "value": 1
+        },
+
+        "MenuFontItalic": {
+            "value": 1
+        },
+
+        "MenuFontUnderline": {
+            "value": 1
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testNotificationDuration.json b/gpii/node_modules/spiSettingsHandler/test/testNotificationDuration.json
index 8888c1cdd..d634a6fe2 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testNotificationDuration.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testNotificationDuration.json
@@ -7,11 +7,14 @@
             "type": "UINT"
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "AudioDescriptionOn": {
-            "value": 7,
             "path": "pvParam"
         }
+    },
+    "settings": {
+        "AudioDescriptionOn": {
+            "value": 7
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testStickyKeys.json b/gpii/node_modules/spiSettingsHandler/test/testStickyKeys.json
index 108b60818..8a607d1d1 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testStickyKeys.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testStickyKeys.json
@@ -12,16 +12,22 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "StickyKeysAvailable": {
-            "value": true,
             "path": "pvParam.dwFlags.SKF_AVAILABLE"
         },
 
         "HotkeyActive": {
-            "value": false,
             "path": "pvParam.dwFlags.SKF_HOTKEYACTIVE"
         }
+    },
+    "settings": {
+        "StickyKeysAvailable": {
+            "value": true
+        },
+
+        "HotkeyActive": {
+            "value": false
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testToggleKeys.json b/gpii/node_modules/spiSettingsHandler/test/testToggleKeys.json
index 492d97f8d..a8ed0c304 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testToggleKeys.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testToggleKeys.json
@@ -12,11 +12,14 @@
             }
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "StickyKeysAvailable": {
-            "value": true,
             "path": "pvParam.dwFlags.TKF_TOGGLEKEYSON"
         }
+    },
+    "settings": {
+        "StickyKeysAvailable": {
+            "value": true
+        }
     }
 }
diff --git a/gpii/node_modules/spiSettingsHandler/test/testUnderlineShortcuts.json b/gpii/node_modules/spiSettingsHandler/test/testUnderlineShortcuts.json
index 6dcc4de86..a83af7951 100644
--- a/gpii/node_modules/spiSettingsHandler/test/testUnderlineShortcuts.json
+++ b/gpii/node_modules/spiSettingsHandler/test/testUnderlineShortcuts.json
@@ -7,11 +7,14 @@
             "type": "UINT"
         }
     },
-
-    "settings": {
+    "supportedSettings": {
         "StickyKeysAvailable": {
-            "value": 1,
             "path": "pvParam"
         }
+    },
+    "settings": {
+        "StickyKeysAvailable": {
+            "value": 1
+        }
     }
 }
diff --git a/package.json b/package.json
index 67faab01b..2a4d773bc 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "dependencies": {
         "edge-js": "10.3.1",
         "ffi-napi": "2.4.3",
-        "gpii-universal": "0.3.0-dev.20191211T142911Z.0af24fabe",
+        "gpii-universal": "sgithens/universal#GPII-3119-part2",
         "@pokusew/pcsclite": "0.4.18",
         "ref": "1.3.4",
         "ref-struct": "1.1.0",