Replace is_validated with status