Updates to templates to remove repeated template code using include statement