Updated directives and templates