Some changes to templates