- added XML Tempalte support