Added custom types to XSD
Improved XSD