Updates to Templates