Update to templates