[TASK] Improve new template