Added data2xml support