XSD restructuring and HTTP timeouts