Updated SOAP classes