Update to template

Add new changes