Changed XML handling