Incorporate the latest changes to WPSClient