Added extra template support