XML rework