Updated SOAP and REST