Validation rewrite