Simplified logic in RestrictionValidator