Minor update to templates