Adding xml support - Fix2