Added XML improvement methods