Fix XMLManager class