Updated version with reduced WSDL