Unique validator refactor