XML improvements