Fixed XMLData.java and other related class