Implemented some more XML checks