Proper template support