Major refactor of Xml properties.