Merge "Adds xsd-type support and appropriate types."