WpsMonitor and WpsMonitorClient merged