Renamed HasXml, prepared Score refactoring