SOAP setup
Refactoring