Added recognition of templates
Adding a todo for dependency direction.