Maps more XSD types