Adds template support