XML not modified after refactor

Previous commit broken due to xml not refactored