Improved XML doc