Made SOAP optional.