Added new templates + directives