Adding xml output support