Added variables
Added varialbes to templates