Add template support