Improved XML printing options
Added scaffold for hotfix enumeration