Added xml support