Platform specific code - work in progress SOAP-679