Updated directives to match new templating.