[#26] Simplify template support flexibility