Changes for WMI tools