Added variables to templates