Changes to templates