Added XML sanity extensions