Adding xml management