Feature/new template