Forgot to add files for commit of template refactoring