[PATCH 1/7] XmlPreprocessor: Changing to XmlTemplates