Template improvement