First version of separated SOAP scripts