Updated XMLManager