Support for xml added