Improve XmlTypeCheck with core file modification

Change-Id: I90fe0e8008d3d762cd9cabfbce01363d6637078d