Adding WifiSwitch Support