Refactored SoapClient