Refactor XMLBuilders