Updates to templater