Better handling of more complex XSDs