Tweaked to handle the new non-WMI changes