Added SOAP option for issue #18