RC1 - added xml checks