Adding some directives and removing duplicates