Added support for SOAP