Changed core XML handling functionality