Refactoring: XML View improvements