Updated some directives