Adding xml support