More consistent XML formats