Some changes in templates