Add more XML elements checking