Replaced SOAP with REST