PDM

Changes on XmlCore following PDM’s rules