Small changes to General XML