Further tweaks following import of SOAP types to get things started for REST bindings