Improved XML schema