[AAI-150 Amsterdam] Modify xsd generation