TASK] Improve templating