Move all validation to validator.xml