More changes to templates