Re-category validations according to spec