Pulled down update to WPSClient