Updates to templates