Issue #0 Template improvement