Validations converted to new format