Updated with templated directives...