Move SOAP related method to Soap class