Some changes into templates