Adapt to XSD while commenting out not yet implemented specs