Refactored single PLAIN XML