Improved XML types