Now with 100% more XML compatibility