Refactored SOAP services