Improved XML syntax