New XML handling of data