Added Xml attribute checks.