XML (improvements added)