xmlRepo refactoring