Update of the templates and review