Add unique validator; namespace all directives